projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c056ccf
)
gpio: nomadik: remove BUG_ON() in nmk_gpio_populate_chip()
author
Dan Carpenter
<dan.carpenter@linaro.org>
Mon, 11 Mar 2024 11:00:53 +0000
(14:00 +0300)
committer
Linus Walleij
<linus.walleij@linaro.org>
Tue, 12 Mar 2024 11:53:33 +0000
(12:53 +0100)
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>
drivers/gpio/gpio-nomadik.c
patch
|
blob
|
history
diff --git
a/drivers/gpio/gpio-nomadik.c
b/drivers/gpio/gpio-nomadik.c
index
463a765
..
5e2f9b5
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;