Skip to content

Commit d5dba32

Browse files
Ychamedavem330
authored andcommitted
atm: solos-pci: Fix potential deadlock on &cli_queue_lock
As &card->cli_queue_lock is acquired under softirq context along the following call chain from solos_bh(), other acquisition of the same lock inside process context should disable at least bh to avoid double lock. <deadlock #1> console_show() --> spin_lock(&card->cli_queue_lock) <interrupt> --> solos_bh() --> spin_lock(&card->cli_queue_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_bh() on the card->cli_queue_lock under process context code consistently to prevent the possible deadlock scenario. Fixes: 9c54004 ("atm: Driver for Solos PCI ADSL2+ card.") Signed-off-by: Chengfeng Ye <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1ae4cd3 commit d5dba32

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/atm/solos-pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,9 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr,
449449
struct sk_buff *skb;
450450
unsigned int len;
451451

452-
spin_lock(&card->cli_queue_lock);
452+
spin_lock_bh(&card->cli_queue_lock);
453453
skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
454-
spin_unlock(&card->cli_queue_lock);
454+
spin_unlock_bh(&card->cli_queue_lock);
455455
if(skb == NULL)
456456
return sprintf(buf, "No data.\n");
457457

0 commit comments

Comments
 (0)