pinctrl: dynamically alloc temp array when parsing dt pinconf options
Allocating the temorary array in pinconf_generic_parse_dt_config on stack
might cause problems later on, when the number of options grows over time.
Therefore also allocate this array dynamically to be on the safe side.
Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Git-commit: 6abab2d4bec982bcefbe99201ddee5f2522
Change-Id: Ie63b66e4d02fc11e9156e6a8608c21e17b71594a
Signed-off-by: Hanumant Singh <hanumant@codeaurora.org>
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index cb6ab32..180b856 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -168,7 +168,7 @@
unsigned long **configs,
unsigned int *nconfigs)
{
- unsigned long cfg[ARRAY_SIZE(dt_params)];
+ unsigned long *cfg;
unsigned int ncfg = 0;
int ret;
int i;
@@ -177,6 +177,11 @@
if (!np)
return -EINVAL;
+ /* allocate a temporary array big enough to hold one of each option */
+ cfg = kzalloc(sizeof(*cfg) * ARRAY_SIZE(dt_params), GFP_KERNEL);
+ if (!cfg)
+ return -ENOMEM;
+
for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
struct pinconf_generic_dt_params *par = &dt_params[i];
ret = of_property_read_u32(np, par->property, &val);
@@ -194,11 +199,13 @@
ncfg++;
}
+ ret = 0;
+
/* no configs found at all */
if (ncfg == 0) {
*configs = NULL;
*nconfigs = 0;
- return 0;
+ goto out;
}
/*
@@ -206,11 +213,16 @@
* found properties.
*/
*configs = kzalloc(ncfg * sizeof(unsigned long), GFP_KERNEL);
- if (!*configs)
- return -ENOMEM;
+ if (!*configs) {
+ ret = -ENOMEM;
+ goto out;
+ }
- memcpy(*configs, &cfg, ncfg * sizeof(unsigned long));
+ memcpy(*configs, cfg, ncfg * sizeof(unsigned long));
*nconfigs = ncfg;
- return 0;
+
+out:
+ kfree(cfg);
+ return ret;
}
#endif