Commit efa95177 authored by Yang Yingliang's avatar Yang Yingliang Committed by Zhang Zekun
Browse files

pinctrl: core: fix possible memory leak when pinctrl_enable() fails 

stable inclusion
from stable-v4.19.320
commit 636f8fe03a14b0994a3dbdc05c8fa8c8296c1357
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAY9KE
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=636f8fe03a14b0994a3dbdc05c8fa8c8296c1357



-------------------------------------------------------------------

[ Upstream commit ae1cf4759972c5fe665ee4c5e0c29de66fe3cf4a ]

In devm_pinctrl_register(), if pinctrl_enable() fails in pinctrl_register(),
the "pctldev" has not been added to dev resources, so devm_pinctrl_dev_release()
can not be called, it leads memory leak.

Introduce pinctrl_uninit_controller(), call it in the error path to free memory.

Fixes: 5038a66dad01 ("pinctrl: core: delete incorrect free in pinctrl_enable()")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20240606023704.3931561-2-yangyingliang@huawei.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
parent b4c65e94

drivers/pinctrl/core.c

+11 −1
Original line number Diff line number Diff line
@@ -1992,6 +1992,14 @@ pinctrl_init_controller(struct pinctrl_desc *pctldesc, struct device *dev, 
	return ERR_PTR(ret);

}



static void pinctrl_uninit_controller(struct pinctrl_dev *pctldev, struct pinctrl_desc *pctldesc)

{

	pinctrl_free_pindescs(pctldev, pctldesc->pins,

			      pctldesc->npins);

	mutex_destroy(&pctldev->mutex);

	kfree(pctldev);

}



static int pinctrl_claim_hogs(struct pinctrl_dev *pctldev)

{

	pctldev->p = create_pinctrl(pctldev->dev, pctldev);
@@ -2073,8 +2081,10 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, 
		return pctldev;



	error = pinctrl_enable(pctldev);

	if (error)

	if (error) {

		pinctrl_uninit_controller(pctldev, pctldesc);

		return ERR_PTR(error);

	}



	return pctldev;