* [PATCH v2 00/12] pinctrl: Fix resource leaks, out-of-bounds accesses, and error handling (batch 2)
@ 2026-11-19 20:48 Lee Jones
2026-11-19 20:49 ` [PATCH v2 09/12] pinctrl: single: Reject invalid register width in pcs_probe() Lee Jones
2026-11-19 20:49 ` [PATCH v2 10/12] pinctrl: single: Free pinconf settings array in pcs_dt_free_map() Lee Jones
0 siblings, 2 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 20:48 UTC (permalink / raw)
To: lee
Cc: linux-kernel, Alexander Sverdlin, Andreas Färber,
Andrew Gaylard, Andrew Jeffery, Andy Shevchenko, Avi Fishman,
Benjamin Fair, Dvorkin Dmitry, Haojian Zhuang,
Harshit Mogalapalli, Jacky Huang, James Tai, jordan_hargrave,
Linus Walleij, linux-arm-kernel, linux-gpio, linux-omap,
linux-realtek-soc, Nancy Yuen, openbmc, Patrick Venture,
Shan-Chun Hung, Tali Perry, tomer.maimon, Tomer Maimon,
Tony Lindgren, Tzuyi Chang, Wells Lu, Yu-Chun Lin
These issues were reported by Sashiko (batch 2).
v1 => v2:
- Rebase onto pinctrl for-next, dropping the manual fwnode_handle_put()
in npcm7xx_gpio_of() now covered by __free(fwnode_handle)
- ma35: Explicitly include the I/O mapping header for iounmap()
- ma35: Retain a reference on bank->fwnode in ma35_pinctrl_get_soc_data()
(Sashiko)
- ma35: Correct the description of commit 3fd976afe974 in the
dt_node_to_map commit message (Sashiko)
- npcm7xx, npcm8xx: Release GPIO bank fwnode_iomap() mappings via devres
on error (Sashiko)
- single: Switch *map and settings in pcs_dt_node_to_map() and
pcs_parse_pinconf() to unmanaged kcalloc()/kfree() so devres teardown
cannot free *map before pcs_dt_free_map() runs
v1: https://lore.kernel.org/all/20261111215256.1982044-1-lee@kernel.org/
Cc: Alexander Sverdlin <alex@sverdlin.org>
Cc: "Andreas Färber" <afaerber@suse.com>
Cc: Andrew Gaylard <ag@ffroot.co.za>
Cc: Andrew Jeffery <andrew@codeconstruct.com.au>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Avi Fishman <avifishman70@gmail.com>
Cc: Benjamin Fair <benjaminfair@google.com>
Cc: Dvorkin Dmitry <dvorkin@tibbo.com>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Cc: Jacky Huang <ychuang3@nuvoton.com>
Cc: James Tai <james.tai@realtek.com>
Cc: jordan_hargrave@dell.com
Cc: Linus Walleij <linusw@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-realtek-soc@lists.infradead.org
Cc: Nancy Yuen <yuenn@google.com>
Cc: openbmc@lists.ozlabs.org
Cc: Patrick Venture <venture@google.com>
Cc: Shan-Chun Hung <schung@nuvoton.com>
Cc: Tali Perry <tali.perry1@gmail.com>
Cc: tomer.maimon@nuvoton.com
Cc: Tomer Maimon <tmaimon77@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Tzuyi Chang <tychang@realtek.com>
Cc: Wells Lu <wellslutw@gmail.com>
Cc: Yu-Chun Lin <eleanor.lin@realtek.com>
Lee Jones (12):
pinctrl: nuvoton: ma35: Unmap reg_base and release clock on probe
error
pinctrl: nuvoton: ma35: Prevent out-of-bounds write in
ma35_pinctrl_get_soc_data()
pinctrl: nuvoton: ma35: Retain child firmware node reference in
ma35_pinctrl_get_soc_data()
pinctrl: nuvoton: ma35: Assign fwnode to gpio_chip in
ma35_gpiolib_register()
pinctrl: nuvoton: ma35: Avoid leaking map when parent node is missing
pinctrl: nuvoton: Unmap GPIO bank registers on error in NPCM7xx and
NPCM8xx
pinctrl: nuvoton: npcm8xx: Propagate npcm8xx_gpio_register() error in
probe
pinctrl: nuvoton: npcm7xx: Fix fwnode_irq_get() error check in
npcm7xx_gpio_of()
pinctrl: single: Reject invalid register width in pcs_probe()
pinctrl: single: Free pinconf settings array in pcs_dt_free_map()
pinctrl: sunplus: Validate pin_func index in sppctl_dt_node_to_map()
pinctrl: realtek: rtd1625: Set dcycle_offset to NA for pins without
duty-cycle support
drivers/pinctrl/nuvoton/pinctrl-ma35.c | 70 +++++++++++++++++++----
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 20 +++++--
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 15 ++++-
drivers/pinctrl/pinctrl-single.c | 49 ++++++++--------
drivers/pinctrl/realtek/pinctrl-rtd1625.c | 12 ++--
drivers/pinctrl/sunplus/sppctl.c | 7 ++-
6 files changed, 126 insertions(+), 47 deletions(-)
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 09/12] pinctrl: single: Reject invalid register width in pcs_probe()
2026-11-19 20:48 [PATCH v2 00/12] pinctrl: Fix resource leaks, out-of-bounds accesses, and error handling (batch 2) Lee Jones
@ 2026-11-19 20:49 ` Lee Jones
2026-11-19 20:49 ` [PATCH v2 10/12] pinctrl: single: Free pinconf settings array in pcs_dt_free_map() Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 20:49 UTC (permalink / raw)
To: lee, Tony Lindgren, Haojian Zhuang, Alexander Sverdlin,
Linus Walleij, linux-arm-kernel, linux-omap, linux-gpio,
linux-kernel
Cc: stable
If the "pinctrl-single,register-width" property specifies an unsupported
width (anything other than 8, 16, or 32), pcs_probe() hits the default
branch in the switch statement and continues without initialising
pcs->read or pcs->write, leading to a divide-by-zero in
pcs_allocate_pin_table() or a NULL function pointer dereference when
accessing registers.
Validate pcs->width immediately after reading the property and return
-EINVAL from the default branch in pcs_probe().
Fixes: 8b8b091bf07f ("pinctrl: Add one-register-per-pin type device tree based pinctrl driver")
Closes: https://sashiko.dev/#/bug/linux-a0303b6e-d0c6-4292-aeeb-fa8a21861827
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
v1 => v2: No changes
drivers/pinctrl/pinctrl-single.c | 34 ++++++++++++++++----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index d72ebb186b89..1779ffbc1181 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1832,6 +1832,23 @@ static int pcs_probe(struct platform_device *pdev)
return ret;
}
+ switch (pcs->width) {
+ case 8:
+ pcs->read = pcs_readb;
+ pcs->write = pcs_writeb;
+ break;
+ case 16:
+ pcs->read = pcs_readw;
+ pcs->write = pcs_writew;
+ break;
+ case 32:
+ pcs->read = pcs_readl;
+ pcs->write = pcs_writel;
+ break;
+ default:
+ return -EINVAL;
+ }
+
ret = of_property_read_u32(np, "pinctrl-single,function-mask",
&pcs->fmask);
if (!ret) {
@@ -1881,23 +1898,6 @@ static int pcs_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pcs);
- switch (pcs->width) {
- case 8:
- pcs->read = pcs_readb;
- pcs->write = pcs_writeb;
- break;
- case 16:
- pcs->read = pcs_readw;
- pcs->write = pcs_writew;
- break;
- case 32:
- pcs->read = pcs_readl;
- pcs->write = pcs_writel;
- break;
- default:
- break;
- }
-
pcs->desc.name = DRIVER_NAME;
pcs->desc.pctlops = &pcs_pinctrl_ops;
pcs->desc.pmxops = &pcs_pinmux_ops;
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 10/12] pinctrl: single: Free pinconf settings array in pcs_dt_free_map()
2026-11-19 20:48 [PATCH v2 00/12] pinctrl: Fix resource leaks, out-of-bounds accesses, and error handling (batch 2) Lee Jones
2026-11-19 20:49 ` [PATCH v2 09/12] pinctrl: single: Reject invalid register width in pcs_probe() Lee Jones
@ 2026-11-19 20:49 ` Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 20:49 UTC (permalink / raw)
To: lee, Tony Lindgren, Haojian Zhuang, Alexander Sverdlin,
Linus Walleij, linux-arm-kernel, linux-omap, linux-gpio,
linux-kernel
Cc: stable
pcs_parse_pinconf() allocates a per-map settings array and attaches it
to map[i].data.configs.configs, while pcs_dt_node_to_map() allocates
*map itself, both via devm_kcalloc() on pcs->dev.
When a consumer device unbinds and re-probes, pcs_dt_free_map() only
frees map and leaks the settings array on pcs->dev. Moreover, because
pcs_probe() registers the pinctrl device with devres before pinctrl
hogs or consumers call pcs_dt_node_to_map(), devres teardown on
pcs->dev unbind frees *map and settings before
devm_pinctrl_dev_release() invokes pcs_dt_free_map().
Allocate *map and settings with unmanaged kcalloc() and free both with
kfree() in pcs_dt_free_map().
Fixes: 8b8b091bf07f ("pinctrl: Add one-register-per-pin type device tree based pinctrl driver")
Fixes: 9dddb4df90d1 ("pinctrl: single: support generic pinconf")
Closes: https://sashiko.dev/#/bug/linux-fcedec46-4487-4392-a882-3d3bef07e56f
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
v1 => v2:
- Switch *map and settings to unmanaged kcalloc()/kfree() so devres
cannot free *map before pcs_dt_free_map() runs
drivers/pinctrl/pinctrl-single.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 1779ffbc1181..1ba692a7ecac 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -311,10 +311,12 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev,
static void pcs_dt_free_map(struct pinctrl_dev *pctldev,
struct pinctrl_map *map, unsigned num_maps)
{
- struct pcs_device *pcs;
+ for (unsigned int i = 0; i < num_maps; i++) {
+ if (map[i].type == PIN_MAP_TYPE_CONFIGS_GROUP)
+ kfree(map[i].data.configs.configs);
+ }
- pcs = pinctrl_dev_get_drvdata(pctldev);
- devm_kfree(pcs->dev, map);
+ kfree(map);
}
static int pcs_dt_node_to_map(struct pinctrl_dev *pctldev,
@@ -964,8 +966,7 @@ static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np,
func->nconfs = nconfs;
conf = &(func->conf[0]);
m++;
- settings = devm_kcalloc(pcs->dev, nconfs, sizeof(unsigned long),
- GFP_KERNEL);
+ settings = kcalloc(nconfs, sizeof(unsigned long), GFP_KERNEL);
if (!settings)
return -ENOMEM;
s = &settings[0];
@@ -1289,7 +1290,7 @@ static int pcs_dt_node_to_map(struct pinctrl_dev *pctldev,
pcs = pinctrl_dev_get_drvdata(pctldev);
/* create 2 maps. One is for pinmux, and the other is for pinconf. */
- *map = devm_kcalloc(pcs->dev, 2, sizeof(**map), GFP_KERNEL);
+ *map = kcalloc(2, sizeof(**map), GFP_KERNEL);
if (!*map)
return -ENOMEM;
@@ -1324,7 +1325,7 @@ static int pcs_dt_node_to_map(struct pinctrl_dev *pctldev,
free_pgnames:
devm_kfree(pcs->dev, pgnames);
free_map:
- devm_kfree(pcs->dev, *map);
+ kfree(*map);
return ret;
}
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 20:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 20:48 [PATCH v2 00/12] pinctrl: Fix resource leaks, out-of-bounds accesses, and error handling (batch 2) Lee Jones
2026-11-19 20:49 ` [PATCH v2 09/12] pinctrl: single: Reject invalid register width in pcs_probe() Lee Jones
2026-11-19 20:49 ` [PATCH v2 10/12] pinctrl: single: Free pinconf settings array in pcs_dt_free_map() Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox