* [PATCH 0/3] gpio: check the return value of irq_alloc_generic_chip()
@ 2017-05-25 8:37 Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 1/3] gpio: pch: " Bartosz Golaszewski
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Bartosz Golaszewski @ 2017-05-25 8:37 UTC (permalink / raw)
To: Linus Walleij, Alexandre Courbot
Cc: linux-gpio, linux-kernel, Bartosz Golaszewski
While hacking on some irq devres stuff I noticed that the return value
of irq_alloc_generic_chip() is not being checked in a couple GPIO
drivers.
Those routines can fail, so check it and bail out if they do.
Bartosz Golaszewski (3):
gpio: pch: check the return value of irq_alloc_generic_chip()
gpio: sta2x11: check the return value of irq_alloc_generic_chip()
gpio: ml-ioh: check the return value of irq_alloc_generic_chip()
drivers/gpio/gpio-ml-ioh.c | 16 +++++++++++++---
drivers/gpio/gpio-pch.c | 15 ++++++++++++---
drivers/gpio/gpio-sta2x11.c | 12 ++++++++++--
3 files changed, 35 insertions(+), 8 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] gpio: pch: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 [PATCH 0/3] gpio: check the return value of irq_alloc_generic_chip() Bartosz Golaszewski
@ 2017-05-25 8:37 ` Bartosz Golaszewski
2017-05-29 11:33 ` Linus Walleij
2017-05-25 8:37 ` [PATCH 2/3] gpio: sta2x11: " Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 3/3] gpio: ml-ioh: " Bartosz Golaszewski
2 siblings, 1 reply; 7+ messages in thread
From: Bartosz Golaszewski @ 2017-05-25 8:37 UTC (permalink / raw)
To: Linus Walleij, Alexandre Courbot
Cc: linux-gpio, linux-kernel, Bartosz Golaszewski
This function can fail, so check the return value before dereferencing
the returned pointer.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-pch.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 71bc6da..f6600f8 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -331,14 +331,18 @@ static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
return ret;
}
-static void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
- unsigned int irq_start, unsigned int num)
+static int pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
+ unsigned int irq_start,
+ unsigned int num)
{
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
gc = irq_alloc_generic_chip("pch_gpio", 1, irq_start, chip->base,
handle_simple_irq);
+ if (!gc)
+ return -ENOMEM;
+
gc->private = chip;
ct = gc->chip_types;
@@ -349,6 +353,8 @@ static void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
IRQ_NOREQUEST | IRQ_NOPROBE, 0);
+
+ return 0;
}
static int pch_gpio_probe(struct pci_dev *pdev,
@@ -425,7 +431,10 @@ static int pch_gpio_probe(struct pci_dev *pdev,
goto err_request_irq;
}
- pch_gpio_alloc_generic_chip(chip, irq_base, gpio_pins[chip->ioh]);
+ ret = pch_gpio_alloc_generic_chip(chip, irq_base,
+ gpio_pins[chip->ioh]);
+ if (ret)
+ goto err_request_irq;
end:
return 0;
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] gpio: sta2x11: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 [PATCH 0/3] gpio: check the return value of irq_alloc_generic_chip() Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 1/3] gpio: pch: " Bartosz Golaszewski
@ 2017-05-25 8:37 ` Bartosz Golaszewski
2017-05-29 11:34 ` Linus Walleij
2017-05-25 8:37 ` [PATCH 3/3] gpio: ml-ioh: " Bartosz Golaszewski
2 siblings, 1 reply; 7+ messages in thread
From: Bartosz Golaszewski @ 2017-05-25 8:37 UTC (permalink / raw)
To: Linus Walleij, Alexandre Courbot
Cc: linux-gpio, linux-kernel, Bartosz Golaszewski
This function can fail, so check the return value before dereferencing
the returned pointer.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-sta2x11.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 39df062..9e70516 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -320,13 +320,16 @@ static irqreturn_t gsta_gpio_handler(int irq, void *dev_id)
return ret;
}
-static void gsta_alloc_irq_chip(struct gsta_gpio *chip)
+static int gsta_alloc_irq_chip(struct gsta_gpio *chip)
{
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
gc = irq_alloc_generic_chip(KBUILD_MODNAME, 1, chip->irq_base,
chip->reg_base, handle_simple_irq);
+ if (!gc)
+ return -ENOMEM;
+
gc->private = chip;
ct = gc->chip_types;
@@ -350,6 +353,8 @@ static void gsta_alloc_irq_chip(struct gsta_gpio *chip)
}
gc->irq_cnt = i - gc->irq_base;
}
+
+ return 0;
}
/* The platform device used here is instantiated by the MFD device */
@@ -400,7 +405,10 @@ static int gsta_probe(struct platform_device *dev)
return err;
}
chip->irq_base = err;
- gsta_alloc_irq_chip(chip);
+
+ err = gsta_alloc_irq_chip(chip);
+ if (err)
+ return err;
err = devm_request_irq(&dev->dev, pdev->irq, gsta_gpio_handler,
IRQF_SHARED, KBUILD_MODNAME, chip);
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] gpio: ml-ioh: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 [PATCH 0/3] gpio: check the return value of irq_alloc_generic_chip() Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 1/3] gpio: pch: " Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 2/3] gpio: sta2x11: " Bartosz Golaszewski
@ 2017-05-25 8:37 ` Bartosz Golaszewski
2017-05-29 11:34 ` Linus Walleij
2 siblings, 1 reply; 7+ messages in thread
From: Bartosz Golaszewski @ 2017-05-25 8:37 UTC (permalink / raw)
To: Linus Walleij, Alexandre Courbot
Cc: linux-gpio, linux-kernel, Bartosz Golaszewski
This function can fail, so check the return value before dereferencing
the returned pointer.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-ml-ioh.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 78896a8..74fdce0 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -385,14 +385,18 @@ static irqreturn_t ioh_gpio_handler(int irq, void *dev_id)
return ret;
}
-static void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
- unsigned int irq_start, unsigned int num)
+static int ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
+ unsigned int irq_start,
+ unsigned int num)
{
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
gc = irq_alloc_generic_chip("ioh_gpio", 1, irq_start, chip->base,
handle_simple_irq);
+ if (!gc)
+ return -ENOMEM;
+
gc->private = chip;
ct = gc->chip_types;
@@ -404,6 +408,8 @@ static void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
IRQ_NOREQUEST | IRQ_NOPROBE, 0);
+
+ return 0;
}
static int ioh_gpio_probe(struct pci_dev *pdev,
@@ -468,7 +474,11 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
goto err_gpiochip_add;
}
chip->irq_base = irq_base;
- ioh_gpio_alloc_generic_chip(chip, irq_base, num_ports[j]);
+
+ ret = ioh_gpio_alloc_generic_chip(chip,
+ irq_base, num_ports[j]);
+ if (ret)
+ goto err_gpiochip_add;
}
chip = chip_save;
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] gpio: pch: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 ` [PATCH 1/3] gpio: pch: " Bartosz Golaszewski
@ 2017-05-29 11:33 ` Linus Walleij
0 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2017-05-29 11:33 UTC (permalink / raw)
To: Bartosz Golaszewski; +Cc: Alexandre Courbot, linux-gpio, linux-kernel
On Thu, May 25, 2017 at 10:37 AM, Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> This function can fail, so check the return value before dereferencing
> the returned pointer.
>
> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] gpio: sta2x11: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 ` [PATCH 2/3] gpio: sta2x11: " Bartosz Golaszewski
@ 2017-05-29 11:34 ` Linus Walleij
0 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2017-05-29 11:34 UTC (permalink / raw)
To: Bartosz Golaszewski; +Cc: Alexandre Courbot, linux-gpio, linux-kernel
On Thu, May 25, 2017 at 10:37 AM, Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> This function can fail, so check the return value before dereferencing
> the returned pointer.
>
> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] gpio: ml-ioh: check the return value of irq_alloc_generic_chip()
2017-05-25 8:37 ` [PATCH 3/3] gpio: ml-ioh: " Bartosz Golaszewski
@ 2017-05-29 11:34 ` Linus Walleij
0 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2017-05-29 11:34 UTC (permalink / raw)
To: Bartosz Golaszewski; +Cc: Alexandre Courbot, linux-gpio, linux-kernel
On Thu, May 25, 2017 at 10:37 AM, Bartosz Golaszewski <brgl@bgdev.pl> wrote:
> This function can fail, so check the return value before dereferencing
> the returned pointer.
>
> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-05-29 11:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-25 8:37 [PATCH 0/3] gpio: check the return value of irq_alloc_generic_chip() Bartosz Golaszewski
2017-05-25 8:37 ` [PATCH 1/3] gpio: pch: " Bartosz Golaszewski
2017-05-29 11:33 ` Linus Walleij
2017-05-25 8:37 ` [PATCH 2/3] gpio: sta2x11: " Bartosz Golaszewski
2017-05-29 11:34 ` Linus Walleij
2017-05-25 8:37 ` [PATCH 3/3] gpio: ml-ioh: " Bartosz Golaszewski
2017-05-29 11:34 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).