Commit c378b3aa authored Feb 28, 2019 by Mark Walton Committed by Linus Walleij Mar 01, 2019

gpio: pca953x: Fix dereference of irq data in shutdown



If a PCA953x gpio was used as an interrupt and then released,
the shutdown function was trying to extract the pca953x_chip
pointer directly from the irq_data, but in reality was getting
the gpio_chip structure.

The net effect was that the subsequent writes to the data
structure corrupted data in the gpio_chip structure, which wasn't
immediately obvious until attempting to use the GPIO again in the
future, at which point the kernel panics.

This fix correctly extracts the pca953x_chip structure via the
gpio_chip structure, as is correctly done in the other irq
functions.

Fixes: 0a70fe00 ("gpio: pca953x: Clear irq trigger type on irq shutdown")
Cc: stable@vger.kernel.org
Signed-off-by: Mark Walton <mark.walton@serialtek.com>
Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent e226e3c3

drivers/gpio/gpio-pca953x.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -659,7 +659,8 @@ static int pca953x_irq_set_type(struct irq_data *d, unsigned int type)

		static void pca953x_irq_shutdown(struct irq_data *d)
		{
		struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
		struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
		struct pca953x_chip *chip = gpiochip_get_data(gc);
		u8 mask = 1 << (d->hwirq % BANK_SZ);

		chip->irq_trig_raise[d->hwirq / BANK_SZ] &= ~mask;

Admin message