[PATCH 4.18 050/158] pinctrl: berlin: fix pctrl->functions allocation in berlin_pinctrl_build_state

[Greg Kroah-Hartman]

4.18-stable review patch.  If anyone has any objections, please let me know.

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

From: YueHaibing <yuehaib...@huawei.com>

[ Upstream commit b5031b7db77dc47f474f0efc2b2552c32b7bb59d ]

fixes following Smatch static check warning:

 drivers/pinctrl/berlin/berlin.c:237 berlin_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: 3de68d331c24 ("pinctrl: berlin: add the core pinctrl driver for Marvell 
Berlin SoCs")
Signed-off-by: YueHaibing <yuehaib...@huawei.com>
Reviewed-by: Jisheng Zhang <jisheng.zh...@synaptics.com>
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/pinctrl/berlin/berlin.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -216,10 +216,8 @@ static int berlin_pinctrl_build_state(st
        }
 
        /* we will reallocate later */
-       pctrl->functions = devm_kcalloc(&pdev->dev,
-                                       max_functions,
-                                       sizeof(*pctrl->functions),
-                                       GFP_KERNEL);
+       pctrl->functions = kcalloc(max_functions,
+                                  sizeof(*pctrl->functions), GFP_KERNEL);
        if (!pctrl->functions)
                return -ENOMEM;
 
@@ -257,8 +255,10 @@ static int berlin_pinctrl_build_state(st
                                function++;
                        }
 
-                       if (!found)
+                       if (!found) {
+                               kfree(pctrl->functions);
                                return -EINVAL;
+                       }
 
                        if (!function->groups) {
                                function->groups =
@@ -267,8 +267,10 @@ static int berlin_pinctrl_build_state(st
                                                     sizeof(char *),
                                                     GFP_KERNEL);
 
-                               if (!function->groups)
+                               if (!function->groups) {
+                                       kfree(pctrl->functions);
                                        return -ENOMEM;
+                               }
                        }
 
                        groups = function->groups;