pinctrl: rza1: Handle devm_kasprintf() failure cases
authorNicholas Mc Guire <hofrat@osadl.org>
Fri, 7 Dec 2018 10:34:27 +0000 (11:34 +0100)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 18 Dec 2018 10:25:56 +0000 (11:25 +0100)
devm_kasprintf() may return NULL on failure of internal allocation
thus the assignments are not safe if not checked. On error
rza1_pinctrl_register() respectively rza1_parse_gpiochip() return
negative values so -ENOMEM in the (unlikely) failure case of
devm_kasprintf() should be fine here.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: 5a49b644b307 ("pinctrl: Renesas RZ/A1 pin and gpio controller")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
drivers/pinctrl/pinctrl-rza1.c

index 14eb576..9cfe9d0 100644 (file)
@@ -1225,6 +1225,9 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
        chip->base      = -1;
        chip->label     = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn",
                                         np);
+       if (!chip->label)
+               return -ENOMEM;
+
        chip->ngpio     = of_args.args[2];
        chip->of_node   = np;
        chip->parent    = rza1_pctl->dev;
@@ -1326,6 +1329,8 @@ static int rza1_pinctrl_register(struct rza1_pinctrl *rza1_pctl)
                pins[i].number = i;
                pins[i].name = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL,
                                              "P%u-%u", port, pin);
+               if (!pins[i].name)
+                       return -ENOMEM;
 
                if (i % RZA1_PINS_PER_PORT == 0) {
                        /*