Commit 4527025
committed
nfc: nci: fix circular locking dependency in nci_close_device
nci_close_device() flushes rx_wq and tx_wq while holding req_lock.
This causes a circular locking dependency because nci_rx_work()
running on rx_wq can end up taking req_lock too:
nci_rx_work -> nci_rx_data_packet -> nci_data_exchange_complete
-> __sk_destruct -> rawsock_destruct -> nfc_deactivate_target
-> nci_deactivate_target -> nci_request -> mutex_lock(&ndev->req_lock)
Move the flush of rx_wq after req_lock has been released.
This should safe (I think) because NCI_UP has already been cleared
and the transport is closed, so the work will see it and return
-ENETDOWN.
NIPA has been hitting this running the nci selftest with a debug
kernel on roughly 4% of the runs.
Fixes: 6a2968a ("NFC: basic NCI protocol implementation")
Reviewed-by: Ian Ray <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>1 parent 57ce3b2 commit 4527025
1 file changed
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
579 | 579 | | |
580 | 580 | | |
581 | 581 | | |
582 | | - | |
583 | | - | |
| 582 | + | |
584 | 583 | | |
585 | 584 | | |
586 | 585 | | |
| |||
592 | 591 | | |
593 | 592 | | |
594 | 593 | | |
595 | | - | |
| 594 | + | |
596 | 595 | | |
597 | 596 | | |
598 | 597 | | |
599 | 598 | | |
600 | 599 | | |
601 | | - | |
| 600 | + | |
602 | 601 | | |
603 | 602 | | |
604 | 603 | | |
| |||
613 | 612 | | |
614 | 613 | | |
615 | 614 | | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
616 | 618 | | |
617 | 619 | | |
618 | 620 | | |
| |||
0 commit comments