[PATCH] gpio: make library immune to error pointers
From: Linus Walleij <hidden>
Date: 2016-06-16 09:59:30
Also in:
stable
Subsystem:
gpio subsystem, the rest · Maintainers:
Linus Walleij, Bartosz Golaszewski, Linus Torvalds
Most functions that take a GPIO descriptor in need to check the descriptor for IS_ERR(). We do this mostly in the VALIDATE_DESC() macro except for the gpiod_to_irq() function which needs special handling. Cc: stable@vger.kernel.org Reported-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Linus Walleij <redacted> --- drivers/gpio/gpiolib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index f39bf05993e7..1a8dbc791892 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c@@ -1371,7 +1371,7 @@ done: * optional GPIO and calls should just bail out. */ #define VALIDATE_DESC(desc) do { \ - if (!desc) \ + if (!desc || IS_ERR(desc)) \ return 0; \ if (!desc->gdev) { \ pr_warn("%s: invalid GPIO\n", __func__); \
@@ -1384,7 +1384,7 @@ done: } } while (0) #define VALIDATE_DESC_VOID(desc) do { \ - if (!desc) \ + if (!desc || IS_ERR(desc)) \ return; \ if (!desc->gdev) { \ pr_warn("%s: invalid GPIO\n", __func__); \
@@ -2061,7 +2061,7 @@ int gpiod_to_irq(const struct gpio_desc *desc) * requires this function to not return zero on an invalid descriptor * but rather a negative error number. */ - if (!desc || !desc->gdev || !desc->gdev->chip) + if (!desc || IS_ERR(desc) || !desc->gdev || !desc->gdev->chip) return -EINVAL; chip = desc->gdev->chip;
--
2.4.11