Skip to content

Commit ae1cf47

Browse files
Yang YingliangLinus Walleij
authored andcommitted
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
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: 5038a66 ("pinctrl: core: delete incorrect free in pinctrl_enable()") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/20240606023704.3931561-2-yangyingliang@huawei.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 1583dc1 commit ae1cf47

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

drivers/pinctrl/core.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2090,6 +2090,14 @@ pinctrl_init_controller(struct pinctrl_desc *pctldesc, struct device *dev,
20902090
return ERR_PTR(ret);
20912091
}
20922092

2093+
static void pinctrl_uninit_controller(struct pinctrl_dev *pctldev, struct pinctrl_desc *pctldesc)
2094+
{
2095+
pinctrl_free_pindescs(pctldev, pctldesc->pins,
2096+
pctldesc->npins);
2097+
mutex_destroy(&pctldev->mutex);
2098+
kfree(pctldev);
2099+
}
2100+
20932101
static int pinctrl_claim_hogs(struct pinctrl_dev *pctldev)
20942102
{
20952103
pctldev->p = create_pinctrl(pctldev->dev, pctldev);
@@ -2170,8 +2178,10 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
21702178
return pctldev;
21712179

21722180
error = pinctrl_enable(pctldev);
2173-
if (error)
2181+
if (error) {
2182+
pinctrl_uninit_controller(pctldev, pctldesc);
21742183
return ERR_PTR(error);
2184+
}
21752185

21762186
return pctldev;
21772187
}

0 commit comments

Comments
 (0)