pinctrl: pinconf-generic: fix properties bitmap leak in parse_fw_cfg()
Subsystems (2)
PATCH 1/1 pinctrl: pinconf-generic: fix properties bitmap leak in parse_fw_cfg()
In parse_fw_cfg(), if fwnode_property_match_property_string() fails with -ENOENT, the code returns directly and leaks the bitmap.
Use __free(bitmap) for automatic cleanup to fix the leak.
Fixes 9c105255108b ("pinctrl: pinconf-generic: perform basic checks on pincfg properties")
Signed-off-by Felix Gu <[email protected]>
--- drivers/pinctrl/pinconf-generic.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/pinctrl/pinconf-generic.c +1 -4
@@ -225,10 +225,9 @@ static int parse_fw_cfg(struct fwnode_handle *fwnode, unsigned int count, unsigned long *cfg, unsigned int *ncfg) { - unsigned long *properties; int i, test; - properties =bitmap_zalloc (count,GFP_KERNEL ); + unsigned long *properties __free(bitmap) = bitmap_zalloc(count, GFP_KERNEL);for (i =0 ; i < count; i++) {u32 val;
@@ -263,7 +262,6 @@ static int parse_fw_cfg(struct fwnode_handle *fwnode,if (ret) {pr_err ("%pfw: conflicting setting detected for %s\n" , fwnode, par->property); -bitmap_free (properties);return -EINVAL ; } }
@@ -295,7 +293,6 @@ static int parse_fw_cfg(struct fwnode_handle *fwnode,pr_err ("%pfw: cannot have multiple drive configurations\n" , fwnode); -bitmap_free (properties);return 0 ; }
---
base-commit: c7275b05bc428c7373d97aa2da02d3a7fa6b9f66
change-id: 20260420-pinconf-fe1894ac02ac
Best regards,
Signature · 1 line
Felix Gu <[email protected]>
Linus Walleij
maintainerQuoted 7 lines · Felix Gu
In
parse_fw_cfg(), iffwnode_property_match_property_string()fails with-ENOENT, the code returns directly and leaks the bitmap.Use
__free(bitmap)for automatic cleanup to fix the leak.Fixes 9c105255108b ("pinctrl: pinconf-generic: perform basic checks on pincfg properties")Signed-off-by Felix Gu <[email protected]>
Very elegant Felix, thanks!
Patch applied.
Yours,
Linus Walleij