From nobody Tue Apr 7 14:36:50 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 199D83AA1AE for ; Thu, 12 Mar 2026 19:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773344257; cv=none; b=cVFr1gshfHSm6f5QENhxBs5YJHhKetSt60QvzXjH5kd3o4sdhxatzY3sNKyQVHUIK7rZJg6UzDz34Sn9e9VAcFQiz3gTs7cgN5LPuyEGzfQ+AAAr+zDvyG5Q+8U07GNzwA/G3TVL+np4qyG7mwyoQOhZOhc1whSl60O6MZ53+mM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773344257; c=relaxed/simple; bh=gXp1sqo04e6LO5/4Vkl6NRi4x49bKddvQgyl58yMMsg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ER0htYwMYZilqoIROs/5aN8+JU8WioTT1yaecNitdqdsvyr7xE4k+TDth+RNAc2nMCtXdvG8qdRPK3EZt6cWEO2OEsdcUP5f5pRa8UCRozZ63uUx+ArUZQ1sBzivWPXGWSKrxlHYVO6RnF4t2Nve9SBCREB+22yDtFg8h+osI0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gE+Hpt1n; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gE+Hpt1n" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ad21f437eeso11924095ad.0 for ; Thu, 12 Mar 2026 12:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773344255; x=1773949055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RzzRjNz0vk0FkgwQahTz097bKivrpMU+EtTeSnfZdlM=; b=gE+Hpt1nBQIUFo/d1YUzifVzwjkYNVE+GBzTWBaHT6yTKGMBcus7rvUtkun0S793jd JB2boFIci6CelAMYrChF+L8MS/hvL857T0BKBcAwza7dTgOYO55Wr3nxp2ajNtP6QGkR vg2Jp1TI8kfuztoJALX7LzdWou/6Fmx6T9bpTwtibBukaqMsPEBW5GmHFZJiA5BkVgpj njv450OipbBbLxvScvG47yOjh9CPAuORNlWpkT2RbYD7jvCvq3n2Z1namP1R0M8BpxpV AQxl2D9xW6yrUB13o4kAIFWmvz9P75Nl8ugE/gYbeAOs3sWIJd/BtGrwOMi2zP40TrRe ACAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773344255; x=1773949055; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RzzRjNz0vk0FkgwQahTz097bKivrpMU+EtTeSnfZdlM=; b=iCl+rok33FbolnCjENITkcCvTBr3udsEnZXRYzPLJTPm6suh8VXxXlo+VJ+CBspj1d AZwTYpIIMcvd10VQLrmdbyGfSN4mTdTIPLPViXIm6X7CNx2m264YBn891cv7Y+NueIAm D5Y3VTVyYGbEEgVjfiW335UQ9HOJ7gprLIHvzrYCX7Ejh+6EDNiNXZi0BRtforx+AAWk aeQmhOYBWGgMCST3az68ZiZehfY7cCIUAGiY9VGSsdoCExrOuLfxYPGzodUJBKikB5b4 jb3Vx6Fv7A207NdxLz+3r6BmWuXMcRsZnKesN5qOtkWsoICFj8f4/eWCCnM/ABow5rZb mHxw== X-Forwarded-Encrypted: i=1; AJvYcCXy73VhkP4GJIKxmvp+29kWCmj+xrpAVogi7BY+0v1H2R7oyJmn8lm5IjW10fWYeHsx5ZG2cMMwuEWlT3k=@vger.kernel.org X-Gm-Message-State: AOJu0YyzWkWV6mNnCSKnHVeLenlVJAiuwq6bKvo+esWjGO3+WvfGqQWC iDm6+cAZzequl1H5Ac9FJarz7h63KAjWuV+7fQoVRcBCKobGpyWxm1wQ X-Gm-Gg: ATEYQzzPCzK0yPgNcW/rafkOETNgT+8uB2bhefUinqF54TOvjLRtjj9V6U3TJn+TrtT 7Jaxfo9HeNqQdRAYrASlenfOCXJclYNgQCuL9kcRKAuk153LGFtVGXRIkQ7rMjYPLH629FbF+qW HbX1f5mhRMpi+Ll362+/O5AHRYE3yNbjp/iJOjluzQaw5GNbvmm2JJj9+jaqlf/j/NFUqeDbLlS 9Zw+HvDVCFjSzndrX8s+ivHwIAKmZJjCYzX2vzyoZdm9V/HG7Th2xFn1YvoCIvYZm4YIUjL3CF3 BNcUCQILfIwytCSt0AQuuJ2/+xXjtnQJTWc7hynHrRr7mENi8cJNZfSFqaadHg5sZd7Dxrd0tey m21fT2DWAazBfiscDnAusXYeL6lLnqrMyy68sEGifJS2jsoQEWVX73ex6vvyvsRHUkyPYLpxnSu 55Pn4nIm5SkgmBTyoLCWKeWWzsjAEHKQri8P7LmfruFJ9qYcAT8JLkHQ== X-Received: by 2002:a17:902:ecc2:b0:2ae:3ae3:432c with SMTP id d9443c01a7336-2aeba46a7d0mr41568145ad.10.1773344255388; Thu, 12 Mar 2026 12:37:35 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae34de20sm62461975ad.60.2026.03.12.12.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 12:37:34 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: "Enrico Weigelt, metux IT consult" , Viresh Kumar , Linus Walleij , Bartosz Golaszewski , Kees Cook , "Gustavo A. R. Silva" , virtualization@lists.linux.dev (open list:VIRTIO GPIO DRIVER), linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCHv3] gpio: virtio: remove one kcalloc Date: Thu, 12 Mar 2026 12:37:17 -0700 Message-ID: <20260312193717.12221-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A flexible array member can be used to combine allocations. Signed-off-by: Rosen Penev Acked-by: Viresh Kumar Reviewed-by: Linus Walleij --- v3: add counting field for __counted_by. v2: add space in struct drivers/gpio/gpio-virtio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-virtio.c b/drivers/gpio/gpio-virtio.c index ed6e0e90fa8a..57d0eb532c3c 100644 --- a/drivers/gpio/gpio-virtio.c +++ b/drivers/gpio/gpio-virtio.c @@ -52,7 +52,6 @@ struct virtio_gpio { struct virtio_device *vdev; struct mutex lock; /* Protects virtqueue operation */ struct gpio_chip gc; - struct virtio_gpio_line *lines; struct virtqueue *request_vq; /* irq support */ @@ -60,6 +59,9 @@ struct virtio_gpio { struct mutex irq_lock; /* Protects irq operation */ raw_spinlock_t eventq_lock; /* Protects queuing of the buffer */ struct vgpio_irq_line *irq_lines; + + u16 ngpio; + struct virtio_gpio_line lines[] __counted_by(ngpio); }; static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio, @@ -541,10 +543,6 @@ static int virtio_gpio_probe(struct virtio_device *vde= v) u16 ngpio; int ret, i; - vgpio =3D devm_kzalloc(dev, sizeof(*vgpio), GFP_KERNEL); - if (!vgpio) - return -ENOMEM; - /* Read configuration */ gpio_names_size =3D virtio_cread32(vdev, offsetof(struct virtio_gpio_config, @@ -556,10 +554,12 @@ static int virtio_gpio_probe(struct virtio_device *vd= ev) return -EINVAL; } - vgpio->lines =3D devm_kcalloc(dev, ngpio, sizeof(*vgpio->lines), GFP_KERN= EL); - if (!vgpio->lines) + vgpio =3D devm_kzalloc(dev, struct_size(vgpio, lines, ngpio), GFP_KERNEL); + if (!vgpio) return -ENOMEM; + vgpio->ngpio =3D ngpio; + for (i =3D 0; i < ngpio; i++) { mutex_init(&vgpio->lines[i].lock); init_completion(&vgpio->lines[i].completion); -- 2.53.0