Skip to content

Commit 7cfbb8b

Browse files
Ychamegregkh
authored andcommitted
atm: solos-pci: Fix potential deadlock on &tx_queue_lock
[ Upstream commit 15319a4e8ee4b098118591c6ccbd17237f841613 ] As &card->tx_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 #2> pclose() --> spin_lock(&card->tx_queue_lock) <interrupt> --> solos_bh() --> fpga_tx() --> spin_lock(&card->tx_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 &card->tx_queue_lock under process context code consistently to prevent the possible deadlock scenario. Fixes: 213e85d ("solos-pci: clean up pclose() function") Signed-off-by: Chengfeng Ye <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 35c63d3 commit 7cfbb8b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/atm/solos-pci.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -956,14 +956,14 @@ static void pclose(struct atm_vcc *vcc)
956956
struct pkt_hdr *header;
957957

958958
/* Remove any yet-to-be-transmitted packets from the pending queue */
959-
spin_lock(&card->tx_queue_lock);
959+
spin_lock_bh(&card->tx_queue_lock);
960960
skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) {
961961
if (SKB_CB(skb)->vcc == vcc) {
962962
skb_unlink(skb, &card->tx_queue[port]);
963963
solos_pop(vcc, skb);
964964
}
965965
}
966-
spin_unlock(&card->tx_queue_lock);
966+
spin_unlock_bh(&card->tx_queue_lock);
967967

968968
skb = alloc_skb(sizeof(*header), GFP_KERNEL);
969969
if (!skb) {

0 commit comments

Comments
 (0)