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: 0e37f88d9ad8 ("ARM: sunxi: Add pinctrl driver for Allwinner SoCs")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 4d9bf9b3e9f3e45d8e7d1eeeeedf4cb88181b46f..26ebedc1f6d31da3780fafb0d2cfd6d1bab6b7fb 100644 (file)
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -1079,10 +1079,9 @@ 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,
-                                      sizeof(*pctl->functions),
-                                      GFP_KERNEL);
+       pctl->functions = kcalloc(pctl->ngroups,
+                                 sizeof(*pctl->functions),
+                                 GFP_KERNEL);
        if (!pctl->functions)
                return -ENOMEM;
 
@@ -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,8 +1143,10 @@ 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;