From ed0428e92812b5d4e9d5c4cbcab9a4f107137dfc Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 9 Jun 2026 23:05:42 -0700 Subject: [PATCH] Input: ipaq-micro-keys - fix potential deadlock The driver acquires the micro->lock spinlock in process context (in micro_key_start() and micro_key_stop()) without disabling interrupts. However, this lock is also acquired in hardirq context by the MFD core rx handler (micro_rx_msg()) which is called from the serial ISR. This can lead to a lock inversion deadlock if the interrupt fires on the same CPU while the process context holds the lock. Fix this by using guard(spinlock_irq) instead of guard(spinlock) in micro_key_start() and micro_key_stop() to disable interrupts while holding the lock. Reported-by: sashiko-bot@kernel.org Assisted-by: Antigravity:gemini-3.5-flash Link: https://patch.msgid.link/aij-pfaKK-Nna7wf@google.com Signed-off-by: Dmitry Torokhov --- drivers/input/keyboard/ipaq-micro-keys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/ipaq-micro-keys.c b/drivers/input/keyboard/ipaq-micro-keys.c index 695ef3c2081a..3c7d6aa0fe29 100644 --- a/drivers/input/keyboard/ipaq-micro-keys.c +++ b/drivers/input/keyboard/ipaq-micro-keys.c @@ -54,7 +54,7 @@ static void micro_key_receive(void *data, int len, unsigned char *msg) static void micro_key_start(struct ipaq_micro_keys *keys) { - guard(spinlock)(&keys->micro->lock); + guard(spinlock_irq)(&keys->micro->lock); keys->micro->key = micro_key_receive; keys->micro->key_data = keys; @@ -62,7 +62,7 @@ static void micro_key_start(struct ipaq_micro_keys *keys) static void micro_key_stop(struct ipaq_micro_keys *keys) { - guard(spinlock)(&keys->micro->lock); + guard(spinlock_irq)(&keys->micro->lock); keys->micro->key = NULL; keys->micro->key_data = NULL;