gpio: nomadik: remove BUG_ON() in nmk_gpio_populate_chip()

Using BUG_ON() is discouraged and also the check wasn't done early
enough to prevent an out of bounds access.  Check earlier and return
an error instead of calling BUG().

Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/ae643df0-3a3e-4270-8dbf-be390ee4b478@moroto.mountain
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
index 463a765620dcc601f71eed66321ff89ec9623af6..5e2f9b51ece3e7a97a3b8975693da43339bd8e34 100644 (file)
--- a/drivers/gpio/gpio-nomadik.c
+++ b/drivers/gpio/gpio-nomadik.c
@@ -533,6 +533,11 @@ struct nmk_gpio_chip *nmk_gpio_populate_chip(struct fwnode_handle *fwnode,
        }
 
 #ifdef CONFIG_PINCTRL_NOMADIK
+       if (id >= ARRAY_SIZE(nmk_gpio_chips)) {
+               dev_err(dev, "populate: invalid id: %u\n", id);
+               platform_device_put(gpio_pdev);
+               return ERR_PTR(-EINVAL);
+       }
        /* Already populated? */
        nmk_chip = nmk_gpio_chips[id];
        if (nmk_chip) {
@@ -606,7 +611,6 @@ struct nmk_gpio_chip *nmk_gpio_populate_chip(struct fwnode_handle *fwnode,
        }
 
 #ifdef CONFIG_PINCTRL_NOMADIK
-       BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));
        nmk_gpio_chips[id] = nmk_chip;
 #endif
        return nmk_chip;