Skip to content

Commit 19d63fd

Browse files
Runyu Xiaogregkh
authored andcommitted
gpio: eic-sprd: use raw_spinlock_t in the irq startup path
commit 90f0109 upstream. sprd_eic_irq_unmask() enables the GPIO IRQ and then updates controller state through sprd_eic_update(), which takes sprd_eic->lock with spin_lock_irqsave(). The callback can be reached from irq_startup() while setting up a requested IRQ. That path is not sleepable, but on PREEMPT_RT a regular spinlock_t becomes a sleeping lock. This issue was found by our static analysis tool and then manually reviewed against the current tree. The grounded PoC kept the request_threaded_irq() -> __setup_irq() -> irq_startup() -> sprd_eic_irq_unmask() -> sprd_eic_update() carrier and used the original spin_lock_irqsave(&sprd_eic->lock) edge. Lockdep reported: BUG: sleeping function called from invalid context hardirqs last disabled at ... __setup_irq.constprop.0 ... [vuln_msv] sprd_rt_spin_lock_irqsave+0x1c/0x30 [vuln_msv] sprd_eic_update.constprop.0+0x48/0x90 [vuln_msv] sprd_eic_irq_unmask.constprop.0+0x35/0x50 [vuln_msv] __setup_irq.constprop.0+0xd/0x30 [vuln_msv] Convert the Spreadtrum EIC controller lock to raw_spinlock_t. The locked section only serializes MMIO register updates and does not contain sleepable operations, so keeping it non-sleeping is appropriate for the irqchip callbacks. Fixes: 25518e0 ("gpio: Add Spreadtrum EIC driver support") Cc: stable@vger.kernel.org Signed-off-by: Runyu Xiao <runyu.xiao@seu.edu.cn> Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Link: https://patch.msgid.link/20260617154035.1199948-3-runyu.xiao@seu.edu.cn Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1dba844 commit 19d63fd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/gpio/gpio-eic-sprd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ struct sprd_eic {
9393
struct gpio_chip chip;
9494
void __iomem *base[SPRD_EIC_MAX_BANK];
9595
enum sprd_eic_type type;
96-
spinlock_t lock;
96+
raw_spinlock_t lock;
9797
int irq;
9898
};
9999

@@ -145,7 +145,7 @@ static void sprd_eic_update(struct gpio_chip *chip, unsigned int offset,
145145
unsigned long flags;
146146
u32 tmp;
147147

148-
spin_lock_irqsave(&sprd_eic->lock, flags);
148+
raw_spin_lock_irqsave(&sprd_eic->lock, flags);
149149
tmp = readl_relaxed(base + reg);
150150

151151
if (val)
@@ -154,7 +154,7 @@ static void sprd_eic_update(struct gpio_chip *chip, unsigned int offset,
154154
tmp &= ~BIT(SPRD_EIC_BIT(offset));
155155

156156
writel_relaxed(tmp, base + reg);
157-
spin_unlock_irqrestore(&sprd_eic->lock, flags);
157+
raw_spin_unlock_irqrestore(&sprd_eic->lock, flags);
158158
}
159159

160160
static int sprd_eic_read(struct gpio_chip *chip, unsigned int offset, u16 reg)
@@ -618,7 +618,7 @@ static int sprd_eic_probe(struct platform_device *pdev)
618618
if (!sprd_eic)
619619
return -ENOMEM;
620620

621-
spin_lock_init(&sprd_eic->lock);
621+
raw_spin_lock_init(&sprd_eic->lock);
622622
sprd_eic->type = pdata->type;
623623

624624
sprd_eic->irq = platform_get_irq(pdev, 0);

0 commit comments

Comments
 (0)