Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04a23b0 authored by Hongzhou Yang's avatar Hongzhou Yang Committed by Linus Walleij
Browse files

pinctrl: mediatek: fix a memleak when do dt maps. 



configs will kmemdup to dup_configs in pictrl util function.
So configs need to be freed.

Signed-off-by: default avatarHongzhou Yang <hongzhou.yang@mediatek.com>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: default avatarYingjoe Chen <yingjoe.chen@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f10a2585

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+17 −10
Original line number Original line Diff line number Diff line
@@ -509,6 +509,9 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 




	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,

	err = pinconf_generic_parse_dt_config(node, pctldev, &configs,

		&num_configs);

		&num_configs);

	if (err)

		return err;



	if (num_configs)

	if (num_configs)

		has_config = 1;

		has_config = 1;
@@ -520,21 +523,23 @@ static int mtk_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 < 0)

	if (err < 0)

		goto fail;

		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)

			goto fail;

			goto exit;





		pin = MTK_GET_PIN_NO(pinfunc);

		pin = MTK_GET_PIN_NO(pinfunc);

		func = MTK_GET_PIN_FUNC(pinfunc);

		func = MTK_GET_PIN_FUNC(pinfunc);
@@ -543,20 +548,21 @@ static int mtk_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
				func >= ARRAY_SIZE(mtk_gpio_functions)) {

				func >= ARRAY_SIZE(mtk_gpio_functions)) {

			dev_err(pctl->dev, "invalid pins value.\n");

			dev_err(pctl->dev, "invalid pins value.\n");

			err = -EINVAL;

			err = -EINVAL;

			goto fail;

			goto exit;

		}

		}





		grp = mtk_pctrl_find_group_by_pin(pctl, pin);

		grp = mtk_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 = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,

		err = mtk_pctrl_dt_node_to_map_func(pctl, pin, func, grp, map,

				reserved_maps, num_maps);

				reserved_maps, num_maps);

		if (err < 0)

		if (err < 0)

			goto fail;

			goto exit;





		if (has_config) {

		if (has_config) {

			err = pinctrl_utils_add_map_configs(pctldev, map,

			err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -564,13 +570,14 @@ static int mtk_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 < 0)

			if (err < 0)

				goto fail;

				goto exit;

		}

		}

	}

	}





	return 0;

	err = 0;





fail:

exit:

	kfree(configs);

	return err;

	return err;

}

}