提交 1ff5ee14 编写于 作者: A Alexandre Torgue 提交者: Greg Kroah-Hartman

pinctrl: stm32: fix memory leak issue

commit cd8c9b5a49576bf28990237715bc2cb2210ac80a upstream.

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: NAlexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 3e777af5
...@@ -410,7 +410,7 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -410,7 +410,7 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
unsigned int num_configs; unsigned int num_configs;
bool has_config = 0; bool has_config = 0;
unsigned reserve = 0; unsigned reserve = 0;
int num_pins, num_funcs, maps_per_pin, i, err; int num_pins, num_funcs, maps_per_pin, i, err = 0;
pctl = pinctrl_dev_get_drvdata(pctldev); pctl = pinctrl_dev_get_drvdata(pctldev);
...@@ -437,41 +437,45 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -437,41 +437,45 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (has_config && num_pins >= 1) if (has_config && num_pins >= 1)
maps_per_pin++; maps_per_pin++;
if (!num_pins || !maps_per_pin) if (!num_pins || !maps_per_pin) {
return -EINVAL; err = -EINVAL;
goto exit;
}
reserve = num_pins * maps_per_pin; reserve = num_pins * maps_per_pin;
err = pinctrl_utils_reserve_map(pctldev, map, err = pinctrl_utils_reserve_map(pctldev, map,
reserved_maps, num_maps, reserve); reserved_maps, num_maps, reserve);
if (err) if (err)
return err; goto exit;
for (i = 0; i < num_pins; i++) { for (i = 0; i < num_pins; i++) {
err = of_property_read_u32_index(node, "pinmux", err = of_property_read_u32_index(node, "pinmux",
i, &pinfunc); i, &pinfunc);
if (err) if (err)
return err; goto exit;
pin = STM32_GET_PIN_NO(pinfunc); pin = STM32_GET_PIN_NO(pinfunc);
func = STM32_GET_PIN_FUNC(pinfunc); func = STM32_GET_PIN_FUNC(pinfunc);
if (!stm32_pctrl_is_function_valid(pctl, pin, func)) { if (!stm32_pctrl_is_function_valid(pctl, pin, func)) {
dev_err(pctl->dev, "invalid function.\n"); dev_err(pctl->dev, "invalid function.\n");
return -EINVAL; err = -EINVAL;
goto exit;
} }
grp = stm32_pctrl_find_group_by_pin(pctl, pin); grp = stm32_pctrl_find_group_by_pin(pctl, pin);
if (!grp) { if (!grp) {
dev_err(pctl->dev, "unable to match pin %d to group\n", dev_err(pctl->dev, "unable to match pin %d to group\n",
pin); pin);
return -EINVAL; err = -EINVAL;
goto exit;
} }
err = stm32_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map, err = stm32_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,
reserved_maps, num_maps); reserved_maps, num_maps);
if (err) if (err)
return err; goto exit;
if (has_config) { if (has_config) {
err = pinctrl_utils_add_map_configs(pctldev, map, err = pinctrl_utils_add_map_configs(pctldev, map,
...@@ -479,11 +483,13 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -479,11 +483,13 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
configs, num_configs, configs, num_configs,
PIN_MAP_TYPE_CONFIGS_GROUP); PIN_MAP_TYPE_CONFIGS_GROUP);
if (err) if (err)
return err; goto exit;
} }
} }
return 0; exit:
kfree(configs);
return err;
} }
static int stm32_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, static int stm32_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册