nfc: nci: complete pending data exchange on device close
Subsystems (3)
PATCH 1/1 nfc: nci: complete pending data exchange on device close
From: Jakub Kicinski <[email protected]>
[ Upstream commit 66083581945bd5b8e99fe49b5aeb83d03f62d053 ]
In nci_close_device(), complete any pending data exchange before closing. The data exchange callback (e.g. rawsock_data_exchange_complete) holds a socket reference.
NIPA occasionally hits this leak:
unreferenced object 0xff1100000f435000 (size 2048):
comm "nci_dev", pid 3954, jiffies 4295441245 hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
27 00 01 40 00 00 00 00 00 00 00 00 00 00 00 00 '..@............
backtrace (crc ec2b3c5):
__kmalloc_noprof+0x4db/0x730
sk_prot_alloc.isra.0+0xe4/0x1d0
sk_alloc+0x36/0x760
rawsock_create+0xd1/0x540
nfc_sock_create+0x11f/0x280
__sock_create+0x22d/0x630
__sys_socket+0x115/0x1d0
__x64_sys_socket+0x72/0xd0
do_syscall_64+0x117/0xfc0
entry_SYSCALL_64_after_hwframe+0x4b/0x53Fixes 38f04c6b1b68 ("NFC: protect nci_data_exchange transactions")
Reviewed-by Joe Damato <[email protected]>
Signed-off-by Jakub Kicinski <[email protected]>
Signed-off-by Rajani Kantha <[email protected]>
--- net/nfc/nci/core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/nfc/nci/core.c +9 -0
@@ -567,6 +567,10 @@ static int nci_close_device(struct nci_dev *ndev)flush_workqueue (ndev->cmd_wq);del_timer_sync (&ndev->cmd_timer);del_timer_sync (&ndev->data_timer); +if (test_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +nci_data_exchange_complete (ndev,NULL , + ndev->cur_conn_id, + -ENODEV );mutex_unlock (&ndev->req_lock);return 0 ; }
@@ -597,6 +601,11 @@ static int nci_close_device(struct nci_dev *ndev)flush_workqueue (ndev->cmd_wq);del_timer_sync (&ndev->cmd_timer); +del_timer_sync (&ndev->data_timer); + +if (test_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +nci_data_exchange_complete (ndev,NULL , ndev->cur_conn_id, + -ENODEV );/* Clear flags except NCI_UNREG */ ndev->flags &=BIT (NCI_UNREG );
Signature · 1 line
2.17.1
Quoted 2 lines · Rajani Kantha
Backport of
66083581945b("nfc: nci: complete pending data exchange on device close") to 6.6.y.
Queued for 6.6, thanks.
--
Thanks,
Sasha