From: Linus Walleij <linusw@kernel.org>
Date: Sun, 17 May 2026 23:01:19 +0000 (+0200)
Subject: pinctrl: starfive: jh7110: Use __counted_by() flexarray
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=50bb01954a457b573c0c574eb89249c776555568;p=thirdparty%2Fkernel%2Flinux.git

pinctrl: starfive: jh7110: Use __counted_by() flexarray

Flexible arrays should use __counted_by() to be able to do
runtime checks that the array does not go out of range.

Cc: Rosen Penev <rosenp@gmail.com>
Fixes: 87182ef0bf93 ("pinctrl: starfive: jh7110: use struct_size")
Signed-off-by: Linus Walleij <linusw@kernel.org>
---

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index 3572e8edd9f30..3fb9aa8ddf074 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -865,6 +865,7 @@ int jh7110_pinctrl_probe(struct platform_device *pdev)
 #endif
 	if (!sfp)
 		return -ENOMEM;
+	sfp->num_saved_regs = info->nsaved_regs;
 
 	sfp->base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(sfp->base))
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
index 188fc9d96269d..12568be285277 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
@@ -21,7 +21,8 @@ struct jh7110_pinctrl {
 	/* register read/write mutex */
 	struct mutex mutex;
 	const struct jh7110_pinctrl_soc_info *info;
-	u32 saved_regs[];
+	unsigned int num_saved_regs;
+	u32 saved_regs[] __counted_by(num_saved_regs);
 };
 
 struct jh7110_gpio_irq_reg {