From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from n169-114.mail.139.com (n169-114.mail.139.com [120.232.169.114]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 418FB38737F for ; Fri, 10 Apr 2026 08:27:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=120.232.169.114 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809648; cv=none; b=FKbizAQyEQE6JmjbpKcW/wwuBmiTm0GWVggEXmWh916LqNli83gmkB53NxYAdVb2fLQh9MustmeVNqNLx7Aimjzcqr2W98MZoc6/SkS58iyBXD6ChA5ffUunCgsqdwLYIJQfRVkyUX4isyCjmcQAOzj5i/n1Ar+ZqRJxZZlWOlA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809648; c=relaxed/simple; bh=52kyBI9vczm0mxdcasMFMZYg1vBayzSBT4M/Wh668Ik=; h=From:To:Subject:Date:Message-Id; b=Hjy9Cz8/Xfbs+AXkwYaXFDIYeTPQ7Xf9P5mzxh9uFsO+/Wmz6orzTK43E+/HfPO2kj0OZgRsmX+c2c4JJYR2i6jOjIk8il2WqTvu0ZrNaSG5WGDBEZRYcRv+engOwlNVXXDhqYN5kO+Hj9KncS9n47nstsIcV4pOKI/eJ3pD0oQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com; spf=pass smtp.mailfrom=139.com; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b=YqBm9Us/; arc=none smtp.client-ip=120.232.169.114 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=139.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b="YqBm9Us/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=139.com; s=dkim; l=0; h=from:subject:message-id:to; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=YqBm9Us/IzxDee2ZSpZiUC7OzkQJFGIq6UpoDqkKXUryV+4nqa3vsRcCcU1cHLKYuO8DP7n4hKTya Z6bVfScKtVN8KVy9TSVojxkLBGvLY6fxj4n+TqeoXL/tBR9TyQT8kVnkn9eNK6Chv97XFVB6HaBo61 FWBEg3ngKcDAc5+E= X-RM-TagInfo: emlType=0 X-RM-SPAM: X-RM-SPAM-FLAG:00000000 Received:from NTT-kernel-dev (unknown[183.241.248.246]) by rmsmtp-lg-appmail-43-12057 (RichMail) with SMTP id 2f1969d8b3a9d35-67e8a; Fri, 10 Apr 2026 16:24:10 +0800 (CST) X-RM-TRANSID:2f1969d8b3a9d35-67e8a From: Rajani Kantha <681739313@139.com> To: joe@dama.to, kuba@kernel.org, stable@vger.kernel.org Subject: [PATCH 6.12.y] nfc: nci: complete pending data exchange on device close Date: Fri, 10 Apr 2026 16:24:03 +0800 Message-Id: <20260410082403.2384-1-681739313@139.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: From: Jakub Kicinski [ 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/0x53 Fixes: 38f04c6b1b68 ("NFC: protect nci_data_exchange transactions") Reviewed-by: Joe Damato Link: https://patch.msgid.link/20260303162346.2071888-4-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Rajani Kantha <681739313@139.com> --- net/nfc/nci/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index d10e2c81131a..058d4eb530fb 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -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); -- 2.17.1