pinctrl: zte: fix 'functions' allocation in zx_pinctrl_build_state()
authorShawn Guo <shawn.guo@linaro.org>
Sun, 16 Jul 2017 13:33:28 +0000 (21:33 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 14 Aug 2017 13:01:01 +0000 (15:01 +0200)
It fixes the following Smatch static check warning:

 drivers/pinctrl/zte/pinctrl-zx.c:338 zx_pinctrl_build_state()
 warn: passing devm_ allocated variable to kfree.

As we will be calling krealloc() on pointer '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.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: cbff0c4d27f4 ("pinctrl: add ZTE ZX pinctrl driver support")
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/zte/pinctrl-zx.c

index f828ee340a98238052448d15a5f7604c286926dd..ded366bb6564d8bda1ff37a65845ed72ea265970 100644 (file)
@@ -295,8 +295,7 @@ static int zx_pinctrl_build_state(struct platform_device *pdev)
        pctldev->num_groups = ngroups;
 
        /* Build function list from pin mux functions */
-       functions = devm_kzalloc(&pdev->dev, info->npins * sizeof(*functions),
-                                GFP_KERNEL);
+       functions = kcalloc(info->npins, sizeof(*functions), GFP_KERNEL);
        if (!functions)
                return -ENOMEM;
 
@@ -367,8 +366,10 @@ static int zx_pinctrl_build_state(struct platform_device *pdev)
                                                func->num_group_names *
                                                sizeof(*func->group_names),
                                                GFP_KERNEL);
-                               if (!func->group_names)
+                               if (!func->group_names) {
+                                       kfree(functions);
                                        return -ENOMEM;
+                               }
                        }
 
                        group = func->group_names;