Skip to contentSkip to conversation

hams: Fix deadlock caused by unsafe-irq lock in sp_get()

PATCH In review Jeongjun Park 2 participants 2 messages Apr 18, 2024 – Apr 22, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hams: Fix deadlock caused by unsafe-irq lock in sp_get()

read_lock() present in sp_get() is interrupt-vulnerable, so the function needs to be modified.

---
 drivers/net/hamradio/6pack.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/hamradio/6pack.c +3 -2
index 6ed38a3cdd73..f882682ff0c8 100644
@@ -372,12 +372,13 @@ static DEFINE_RWLOCK(disc_data_lock);
 static struct sixpack *sp_get(struct tty_struct *tty)
 {
 	struct sixpack *sp;
+	unsigned long flags;
 
-	read_lock(&disc_data_lock);
+	flags = read_lock_irqsave(&disc_data_lock);
 	sp = tty->disc_data;
 	if (sp)
 		refcount_inc(&sp->refcnt);
-	read_unlock(&disc_data_lock);
+	read_unlock_irqrestore(&disc_data_lock, flags);
 
 	return sp;
 }
Signature · 1 line
2.34.1
#1 lore raw
Quoted 15 lines · Jeongjun Park

read_lock() present in sp_get() is interrupt-vulnerable, so the function needs to be modified.

---
 drivers/net/hamradio/6pack.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/hamradio/6pack.c +0 -0
index 6ed38a3cdd73..f882682ff0c8 100644

drivers/net/hamradio/6pack.c static DEFINE_RWLOCK(disc_data_lock); · line 377

Quoted 7 lines
drivers/net/hamradio/6pack.c +2 -1
@@ -372,12 +372,13 @@ static DEFINE_RWLOCK(disc_data_lock);
 static struct sixpack *sp_get(struct tty_struct *tty)
 {
 	struct sixpack *sp;
+	unsigned long flags;
 
-	read_lock(&disc_data_lock);
+	flags = read_lock_irqsave(&disc_data_lock);

This doesn't compile. At least build test your patches.

regards,
dan carpenter