From nobody Mon Jun 8 17:38:02 2026 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 4000C3BADB4 for ; Wed, 27 May 2026 20:23:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779913417; cv=none; b=nuxDC4hgjHSNBono+ki44jrTB+cU7gx+5QiT0zsX8elr3IESQFVOdDAFSr/tpT8DkxoAaHVaeIYRbcrKutad+YWirCsEYdZr5oJY6CiWTkZLQIEKGVuDc946huDFsXDOs2F5amx+NylZxiEi9Ik2HQ1iIfCN7TXbci76WiTvcQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779913417; c=relaxed/simple; bh=BSWJULvoBmQ01varBYGhf90UhppUbekoIBkxkLvAH7o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UB419ExoyiIwN1RXSBCDeNtWhlwH6PoPrzajzzJQVclRh2ZR4pXqcxgZbOjFm2JEoXxEQQAmObjNgSZDtT4Gae6bdHizR7c505+2yBu5heP5wuI9uLGVBv4dRc4QsKC8nss/xdSrax2AOvLTbFrDL7qPHzxLCopPV+fMVTYPv6w= 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=No482oI8; arc=none smtp.client-ip=209.85.210.180 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="No482oI8" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8367df48711so5300467b3a.1 for ; Wed, 27 May 2026 13:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779913415; x=1780518215; 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=Cn8TgOXEJPkKfmJoKgQlP84ES1byNpZd3Py/qzmBsUY=; b=No482oI898s9Z5JPjUgpl2nGRgXiOO88bE7K4NCkfLpS+HuTScs9ryGL+bOAe3meYX SGNaS2U03fwmrsQKNKUBfYCuKBY/2tMx1F1VF/hYAHlSFD+MiDBh7eHjunuM0jk75AIY PjYiIztNx1UAfSGdGgbkI20vDiVSSnf9p38VUjO7c/YfklxTlcq1V0uyI+JqGziMX4vu eZDhr905ks66pjBrhXtvokLl3SLiMYAdgO4Xwqn8OPHlSahAcuWkLrXewzH2lqZW+wnZ g0UtWtSKEf62Q7bk+EyuJsw8fKe3qkm4hKl5Px2uWNJBHgBNobGxBEpX3HW5hAlr8V2i HekA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779913415; x=1780518215; 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=Cn8TgOXEJPkKfmJoKgQlP84ES1byNpZd3Py/qzmBsUY=; b=X4TqPTCtl9lcPpsLoRejdLUmFhLUsjJRQmoXfAeOB6JQA+VK5ZrbwrNT0VHBxLcpqK ItKiwISS39O8C/Sbt5RDztpuiJ/E+MO4bRe6vNvU1iBnZMxWiKGiXcMMB7ByTe6DVih1 pIj8YzvBfzvDKCrQxkjDehVVwClYuMaGiQgowck4NWQt966v8gGLjbtze3tA1A1sikPk 5WNTJ081a70xmvm3LVBiGaL0lCQt6xU2RUwyesclt88/1OYI2NBxY2Ny11TJeAQqn36g RCnbGGHz5KZBmt7cFsgQR8gkjeDhG1QERrlc6f3QnNvTRkbY5H/Uy29lWRo+ZAtx2s+8 6gWQ== X-Forwarded-Encrypted: i=1; AFNElJ9zr+O+Supa7gGVn2feKtG+ndN+iY9UPbAKR3m9lERpp+CDC3i3y0fYoIbYE8o2mH6Huo2d8XwRETrcB9k=@vger.kernel.org X-Gm-Message-State: AOJu0YzTiSmA4mBOh2pyfGQF+mLwJKLswI1TXuBCoVDektKtDOYPEzIw UDtEAHv1Y2agj+rbbHA1cjeLaH6iuj9aTTrSapCameAcLqBFuVnQQzcv X-Gm-Gg: Acq92OH/YjstJD6mr25Cwm9ROaL1vCphvP6oWHpbP+pTNMfsPjRE9RIIkZ7pyO/U0pu P3SQJuzggnfiZ+KaoqMQ796YuefXjnsqSmi+iaM/8wxJkmry86GBOtLxMCjpKUIkEr4arms/0rm xAUuC6yQfsrYB4Dx2mqXdVCFUJUJRMEMfqjiLmVUY9YptxG6ID+Sjs56cGGRrVxWwNdIoBYIzJI lKKb6cvMZ5iyIxe4BUCFa1aLVMmzhKYB6SKRCTDcDwNTQMC6RAksOvTkgD7dxoMlN+iKRlz4oVS Oaraywb0OGbLyeCNWUeDr7/9Bn3DB996+ro2ZIUcQ+BdvCdaVDc5BsW3RR11WlcM1+06s3DTov/ bCmLk68O2wPkTDf8C5nI1RCpdA0Q+FvM6BswlMN7vbnxHAhOGNClbjwxbBwcO3c8L31tE2zkp44 iCHlq7mcJt7JOEwLIahtXzQpiy8zTMbx2tJ+giSG9CGVIfWd+M6GpJU9kQpFRb4k63AkAgbseQp cnO58HCYnpQlkcDHnQWsFmjweGpX1leW8MbqGDM6QnGv1ahfL0NFIZy X-Received: by 2002:a05:6a00:a92:b0:83b:b0c2:17ea with SMTP id d2e1a72fcca58-8415f544febmr23916071b3a.37.1779913415482; Wed, 27 May 2026 13:23:35 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-841d6e80269sm3330540b3a.4.2026.05.27.13.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 13:23:34 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Geert Uytterhoeven , Linus Walleij , Kees Cook , "Gustavo A. R. Silva" , linux-renesas-soc@vger.kernel.org (open list:PIN CONTROLLER - RENESAS), 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|_ptr)?\b) Subject: [PATCHv2] pinctrl: rza2: embed pins in the priv struct Date: Wed, 27 May 2026 13:23:17 -0700 Message-ID: <20260527202317.5347-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.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" Turn the separately allocated pinctrl_pin_desc array into a flexible array member of struct rza2_pinctrl_priv, annotated with __counted_by(npins). The pin count is now computed before allocation so struct_size() can size the combined object, collapsing two allocations into one. Change npins to unsigned int to avoid potential overflow/underflow errors. Assisted-by: Claude:Opus-4.7 Signed-off-by: Rosen Penev Reviewed-by: Geert Uytterhoeven --- v2: use unsigned inr drivers/pinctrl/renesas/pinctrl-rza2.c | 28 ++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/pinctrl/renesas/pinctrl-rza2.c b/drivers/pinctrl/renes= as/pinctrl-rza2.c index 8618f32ed26a..15ae5a88d705 100644 --- a/drivers/pinctrl/renesas/pinctrl-rza2.c +++ b/drivers/pinctrl/renesas/pinctrl-rza2.c @@ -44,12 +44,12 @@ struct rza2_pinctrl_priv { struct device *dev; void __iomem *base; - struct pinctrl_pin_desc *pins; struct pinctrl_desc desc; struct pinctrl_dev *pctl; struct pinctrl_gpio_range gpio_range; - int npins; + unsigned int npins; struct mutex mutex; /* serialize adding groups and functions */ + struct pinctrl_pin_desc pins[] __counted_by(npins); }; #define RZA2_PDR(port) (0x0000 + (port) * 2) /* Direction 16-bit */ @@ -289,21 +289,17 @@ static int rza2_gpio_register(struct rza2_pinctrl_pri= v *priv) static int rza2_pinctrl_register(struct rza2_pinctrl_priv *priv) { - struct pinctrl_pin_desc *pins; + struct pinctrl_pin_desc *pin; unsigned int i; int ret; - pins =3D devm_kcalloc(priv->dev, priv->npins, sizeof(*pins), GFP_KERNEL); - if (!pins) - return -ENOMEM; - - priv->pins =3D pins; - priv->desc.pins =3D pins; + priv->desc.pins =3D priv->pins; priv->desc.npins =3D priv->npins; for (i =3D 0; i < priv->npins; i++) { - pins[i].number =3D i; - pins[i].name =3D rza2_gpio_names[i]; + pin =3D &priv->pins[i]; + pin->number =3D i; + pin->name =3D rza2_gpio_names[i]; } ret =3D devm_pinctrl_register_and_init(priv->dev, &priv->desc, priv, @@ -482,12 +478,17 @@ static const struct pinmux_ops rza2_pinmux_ops =3D { static int rza2_pinctrl_probe(struct platform_device *pdev) { struct rza2_pinctrl_priv *priv; + unsigned int npins; int ret; - priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + npins =3D (uintptr_t)of_device_get_match_data(&pdev->dev) * + RZA2_PINS_PER_PORT; + + priv =3D devm_kzalloc(&pdev->dev, struct_size(priv, pins, npins), GFP_KER= NEL); if (!priv) return -ENOMEM; + priv->npins =3D npins; priv->dev =3D &pdev->dev; priv->base =3D devm_platform_ioremap_resource(pdev, 0); @@ -498,9 +499,6 @@ static int rza2_pinctrl_probe(struct platform_device *p= dev) platform_set_drvdata(pdev, priv); - priv->npins =3D (int)(uintptr_t)of_device_get_match_data(&pdev->dev) * - RZA2_PINS_PER_PORT; - priv->desc.name =3D DRIVER_NAME; priv->desc.pctlops =3D &rza2_pinctrl_ops; priv->desc.pmxops =3D &rza2_pinmux_ops; -- 2.54.0