Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpio: timberdale: Fix potential deadlock on &tgpio->lock

Browse source 
[ Upstream commit 9e8bc2dda5a7a8e2babc9975f4b11c9a6196e490 ]

As timbgpio_irq_enable()/timbgpio_irq_disable() callback could be
executed under irq context, it could introduce double locks on
&tgpio->lock if it preempts other execution units requiring
the same locks.

timbgpio_gpio_set()
--> timbgpio_update_bit()
--> spin_lock(&tgpio->lock)
<interrupt>
   --> timbgpio_irq_disable()
   --> spin_lock_irqsave(&tgpio->lock)

This flaw was found by an experimental static analysis tool I am
developing for irq-related deadlock.

To prevent the potential deadlock, the patch uses spin_lock_irqsave()
on &tgpio->lock inside timbgpio_gpio_set() to prevent the possible
deadlock scenario.

Signed-off-by: Chengfeng Ye <dg573847474@gmail.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chengfeng Ye 2023-09-26 10:29:14 +00:00 • committed by Ksawlii
parent bda5988fd1
commit b92ff16804
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpio/gpio-timberdale.c
View file

@ -43,9 +43,10 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index,
unsigned offset, bool enabled) unsigned offset, bool enabled)
{ {
struct timbgpio *tgpio = gpiochip_get_data(gpio); struct timbgpio *tgpio = gpiochip_get_data(gpio);
unsigned long flags;
u32 reg; u32 reg;
spin_lock(&tgpio->lock); spin_lock_irqsave(&tgpio->lock, flags);
reg = ioread32(tgpio->membase + offset); reg = ioread32(tgpio->membase + offset);
if (enabled) if (enabled)
@ -54,7 +55,7 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index,
reg &= ~(1 << index); reg &= ~(1 << index);
iowrite32(reg, tgpio->membase + offset); iowrite32(reg, tgpio->membase + offset);
spin_unlock(&tgpio->lock); spin_unlock_irqrestore(&tgpio->lock, flags);
return 0; return 0;
} }