pinctrl: sunxi: Fix a memory leak in 'sunxi_pinctrl_build_state()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 16 Oct 2018 06:22:28 +0000 (08:22 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 16 Oct 2018 08:03:48 +0000 (10:03 +0200)
If 'krealloc()' fails, 'pctl->functions' is set to NULL.
We should instead use a temp variable in order to be able to free the
previously allocated memeory, in case of OOM.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sunxi/pinctrl-sunxi.c

index 213a5d5d73f0034b243728e34f6fffcd62920d63..34e17376ef99ecd9e533d9346ca7145392d6b1c2 100644 (file)
@@ -1042,6 +1042,7 @@ static int sunxi_pinctrl_add_function(struct sunxi_pinctrl *pctl,
 static int sunxi_pinctrl_build_state(struct platform_device *pdev)
 {
        struct sunxi_pinctrl *pctl = platform_get_drvdata(pdev);
 static int sunxi_pinctrl_build_state(struct platform_device *pdev)
 {
        struct sunxi_pinctrl *pctl = platform_get_drvdata(pdev);
+       void *ptr;
        int i;
 
        /*
        int i;
 
        /*
@@ -1108,13 +1109,15 @@ static int sunxi_pinctrl_build_state(struct platform_device *pdev)
        }
 
        /* And now allocated and fill the array for real */
        }
 
        /* And now allocated and fill the array for real */
-       pctl->functions = krealloc(pctl->functions,
-                                  pctl->nfunctions * sizeof(*pctl->functions),
-                                  GFP_KERNEL);
-       if (!pctl->functions) {
+       ptr = krealloc(pctl->functions,
+                      pctl->nfunctions * sizeof(*pctl->functions),
+                      GFP_KERNEL);
+       if (!ptr) {
                kfree(pctl->functions);
                kfree(pctl->functions);
+               pctl->functions = NULL;
                return -ENOMEM;
        }
                return -ENOMEM;
        }
+       pctl->functions = ptr;
 
        for (i = 0; i < pctl->desc->npins; i++) {
                const struct sunxi_desc_pin *pin = pctl->desc->pins + i;
 
        for (i = 0; i < pctl->desc->npins; i++) {
                const struct sunxi_desc_pin *pin = pctl->desc->pins + i;