]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nfc: nci: fix circular locking dependency in nci_close_device
authorJakub Kicinski <kuba@kernel.org>
Tue, 17 Mar 2026 19:33:34 +0000 (12:33 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Mar 2026 23:56:18 +0000 (16:56 -0700)
commit4527025d440ce84bf56e75ce1df2e84cb8178616
tree4db6f55aeb815d818046869d809a997a2de74113
parent57ce3b2e9cdabcbc4d5a10f0e97a1399058c7417
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: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
Reviewed-by: Ian Ray <ian.ray@gehealthcare.com>
Link: https://patch.msgid.link/20260317193334.988609-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/nfc/nci/core.c