提交 d2a76333 编写于 作者: Y YueHaibing 提交者: Greg Kroah-Hartman

pinctrl: sunxi: fix 'pctrl->functions' allocation in sunxi_pinctrl_build_state

[ Upstream commit a4925311a5443126ecc90671a1604ea7b0f5b32e ]

fixes following Smatch static check warning:

 ./drivers/pinctrl/sunxi/pinctrl-sunxi.c:1112 sunxi_pinctrl_build_state()
 warn: passing devm_ allocated variable to kfree. 'pctrl->functions'

As we will be calling krealloc() on pointer 'pctrl->functions', which means
kfree() will be called in there, devm_kzalloc() shouldn't be used with
the allocation in the first place.  Fix the warning by calling kcalloc()
and managing the free procedure in error path on our own.

Fixes: 0e37f88d ("ARM: sunxi: Add pinctrl driver for Allwinner SoCs")
Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
Acked-by: NMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 918d81fd
......@@ -1079,8 +1079,7 @@ static int sunxi_pinctrl_build_state(struct platform_device *pdev)
* We suppose that we won't have any more functions than pins,
* we'll reallocate that later anyway
*/
pctl->functions = devm_kcalloc(&pdev->dev,
pctl->ngroups,
pctl->functions = kcalloc(pctl->ngroups,
sizeof(*pctl->functions),
GFP_KERNEL);
if (!pctl->functions)
......@@ -1133,8 +1132,10 @@ static int sunxi_pinctrl_build_state(struct platform_device *pdev)
func_item = sunxi_pinctrl_find_function_by_name(pctl,
func->name);
if (!func_item)
if (!func_item) {
kfree(pctl->functions);
return -EINVAL;
}
if (!func_item->groups) {
func_item->groups =
......@@ -1142,9 +1143,11 @@ static int sunxi_pinctrl_build_state(struct platform_device *pdev)
func_item->ngroups,
sizeof(*func_item->groups),
GFP_KERNEL);
if (!func_item->groups)
if (!func_item->groups) {
kfree(pctl->functions);
return -ENOMEM;
}
}
func_grp = func_item->groups;
while (*func_grp)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册