]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: at91-pio4: fix memleak after using dt map
authorLudovic Desroches <ludovic.desroches@atmel.com>
Tue, 1 Dec 2015 14:19:02 +0000 (15:19 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Dec 2015 17:26:19 +0000 (18:26 +0100)
configs is allocated by pinconf_generic_parse_dt_config(),
pinctrl_utils_add_map_configs() duplicates configs so it can and has to
be freed to prevent memory leaks.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Reported-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-at91-pio4.c

index abdc16e5a970de245dc9c81b60d21dba3cd8d84d..d5bdcebc6aa695b2036da1c69e3c548673cccca2 100644 (file)
@@ -500,7 +500,8 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
        if (!num_pins) {
                dev_err(pctldev->dev, "no pins found in node %s\n",
                        of_node_full_name(np));
-               return -EINVAL;
+               ret = -EINVAL;
+               goto exit;
        }
 
        /*
@@ -514,19 +515,19 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
        ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
                                        reserve);
        if (ret < 0)
-               return ret;
+               goto exit;
 
        for (i = 0; i < num_pins; i++) {
                const char *group, *func;
 
                ret = of_property_read_u32_index(np, "pinmux", i, &pinfunc);
                if (ret)
-                       return ret;
+                       goto exit;
 
                ret = atmel_pctl_xlate_pinfunc(pctldev, np, pinfunc, &group,
                                               &func);
                if (ret)
-                       return ret;
+                       goto exit;
 
                pinctrl_utils_add_map_mux(pctldev, map, reserved_maps, num_maps,
                                          group, func);
@@ -537,11 +538,13 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
                                        configs, num_configs,
                                        PIN_MAP_TYPE_CONFIGS_GROUP);
                        if (ret < 0)
-                               return ret;
+                               goto exit;
                }
        }
 
-       return 0;
+exit:
+       kfree(configs);
+       return ret;
 }
 
 static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,