From nobody Thu Apr 9 09:02:43 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 81F3B331212 for ; Tue, 10 Mar 2026 02:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773108079; cv=none; b=fuswtVwu+zoY3QuSX3Vb3iyUY6NcV7PGPaPtg7wbRIDrPUKrnp1Z07sEMN1ZH0R5njnV93WrbXEwxhyjqMBhLT+rbvwxywBcPprBi4lHU7ZqmNkvvFAkhvODpLeYmvCsp9DqcvMAtyC3MAse1kF/ih7KtLptPX7n2RAMre1rm4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773108079; c=relaxed/simple; bh=r74vXhE8Sb4aeEjXyTRfyESwDzvu/qDaicDAjMleUvs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ErqsHqsotkH/MoNhOV2x3fc5dNHc/B0qkJ19N8MvjOIYk/RksPuQkTpjeNQezYMuhGoRWimRYBFx7ZD51Twg5uAmuewvrYasiBUWZftdjgiwk9p8friQBEqHgiYXJFo3sYATSfszOzDuI6x+o/FQD1m2pfCxR7cYYBjsuZ6znpc= 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=dJNOb5Jj; arc=none smtp.client-ip=209.85.215.176 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="dJNOb5Jj" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c6e2355739dso4993628a12.2 for ; Mon, 09 Mar 2026 19:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773108076; x=1773712876; 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=lALqj4AFCCf04PXMDS8nK7oxi7K5MFhENXcy3JAs/Dw=; b=dJNOb5Jjoc+jmdYmgiu8+0knsmzfzdQvaoaUBRVv6lCtAtSXO0FEN+ZJpoVjxUs8B0 Y2GiMIilV/ishEkDr3qPEo80DL15wyeVomYUQabdTOibrSVvsdaY56drAgsaSfjsF8ZH nvLtM4LvatzOFauc8/UDfhdSCX+5AQocJEb0dbV+fPO8giuwvwIsveckgFNigs4wq4Ir lNNLnN5mmMeH5imwjvTUgtmPK53wAIJfX/mszGqY+PDvRZ/+VWwOH4RUd/c8Sklvsc2M /4maCJwiAfdlHoglKfCj0qn/jJCg/BuhBoG4aD5+Kw84lkS10Dvxlcxr/MBP58cZ7d5n XjZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773108076; x=1773712876; 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=lALqj4AFCCf04PXMDS8nK7oxi7K5MFhENXcy3JAs/Dw=; b=Rai1cKlKqmCkJMkcAKqWb8QvvxDXIhX/BfJlL7Rk+yAOD1oASFCEAxOckEWhrUgGX0 aaMNuln+JXies3oWuGSZW/J1++oJuNITAt3RwmOrbScV/cHDJMtewJ69yjy/aeiEbyb0 BuiBhtyJ3N2AA6kfaicKwk9h/0/HVt9w1fzA3hEvz5NolhiyGcxBq9wV/8PeVgrnVZtR zmx/TeBsIHqewzrb8vj2QtQVkWc5ScQ+aPdXv4nOn+zy4Y2XX3D+717vsrFbj8eEBFiY /ZpK0T6aIXC/raotlX2KPhi64xTo6CTO9TTK/wwaCoSLAyImwiSQVY3zVM9PlbOO24RW T7XA== X-Forwarded-Encrypted: i=1; AJvYcCVKjPptrtMMH7BPOPmXboSNltTDRZhPJN1ELxifA+3aGL7vEgCMj9+V5Q2ergxIiaNjPlu9zQkS1Y8xuwM=@vger.kernel.org X-Gm-Message-State: AOJu0YzNoxpqaDeI2Jt8C7/oQsl1dftOttPyFhLwPf/LCjFuwoZqfXvn Ncn8u4weC9ny3/+kPkT3rbaLwebkAvjqjnN6QkVSkJJwrOAX0zhCJ+na X-Gm-Gg: ATEYQzwG/gnc4JQRCDW5ulXpPMOpyVAwaBZaUGQp1WUxDgh8pd/KwNPaW1lhhOZy9t1 qXr5hADOcS7TIs6hqwPyCk1KjQ3sMniKPuMmKxS1N1AeKbAZZ3cnkUgChjo464iQAt5WSyL18IC W6jfm6kizQd3iKP7gA8tR6i6QnodMGwwWKJBRToy3I6S50Ryiv3KGe1hYogR2hMWeBKAC8pZmxD 2K3prVaQquTfL+vvNWKuYjMiAz6MRf+SVuzO2luHAO8qtwgdGwJmtj8TLYe0nn8DApI3+3fwthL JfkDXGjRwECAlDB1EePVrc/ixTlqI6HIHb8P1Z1Uu3MGZoi2t1MS+CrUQHt7/OC1t/iP4EcQBUf cZAIDbYviaJadfyW93ZmLB/6iZAQ5jbJEQF0jiUt8E0oYK0WdPr0Z+o+azQLVkgIdBbMujYBP6Z OxOFbwdVdZaAmbn9IEVZ/OixPzH2512MUEJsX3no6bzbRmmIajkQM3sA== X-Received: by 2002:a17:903:2c50:b0:2ae:57e6:616c with SMTP id d9443c01a7336-2ae82362d1cmr136082195ad.3.1773108075517; Mon, 09 Mar 2026 19:01:15 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae83f78370sm135102865ad.43.2026.03.09.19.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 19:01:15 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: "Enrico Weigelt, metux IT consult" , linux-hardening@vger.kernel.org, gustavoars@kernel.org, Viresh Kumar , Linus Walleij , Bartosz Golaszewski , virtualization@lists.linux.dev (open list:VIRTIO GPIO DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] gpio: virtio: remove one kcalloc Date: Mon, 9 Mar 2026 19:00:57 -0700 Message-ID: <20260310020057.340550-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 --- drivers/gpio/gpio-virtio.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-virtio.c b/drivers/gpio/gpio-virtio.c index ed6e0e90fa8a..876a34ed739d 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; =20 /* irq support */ @@ -60,6 +59,7 @@ 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; + struct virtio_gpio_line lines[]; }; =20 static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio, @@ -541,10 +541,6 @@ static int virtio_gpio_probe(struct virtio_device *vde= v) u16 ngpio; int ret, i; =20 - 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,8 +552,8 @@ static int virtio_gpio_probe(struct virtio_device *vdev) return -EINVAL; } =20 - 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; =20 for (i =3D 0; i < ngpio; i++) { --=20 2.53.0