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

Commit 24d78662 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

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



[ 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>
parent 64c0b8e6

drivers/pinctrl/core.c

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

	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)

static int pinctrl_claim_hogs(struct pinctrl_dev *pctldev)

{

{

	pctldev->p = create_pinctrl(pctldev->dev, pctldev);

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

		return pctldev;





	error = pinctrl_enable(pctldev);

	error = pinctrl_enable(pctldev);

	if (error)

	if (error) {

		pinctrl_uninit_controller(pctldev, pctldesc);

		return ERR_PTR(error);

		return ERR_PTR(error);

	}





	return pctldev;

	return pctldev;