From: Henry Martin <bsdhenrymartin@gmail.com>
To: david@ixit.cz, davem@davemloft.net, edumazet@kernel.org,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org
Cc: oe-linux-nfc@lists.linux.dev, netdev@vger.kernel.org,
Henry Martin <bsdhenrymartin@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH net v2] nfc: llcp: fix socket list self-loop on connect of a linked socket
Date: Fri, 20 Nov 2026 15:59:08 +0800 [thread overview]
Message-ID: <20261120075908.4064155-1-bsdhenrymartin@gmail.com> (raw)
llcp_sock_connect() only rejects LLCP_CONNECTED and LLCP_CONNECTING, so a
socket that is still linked in local->sockets can be linked a second time
into local->connecting_sockets. That covers bound and listening sockets,
and sockets that a peer moved to LLCP_CLOSED with DISC or DM.
Both lists use sk->sk_node. When the peer answers with CC,
nfc_llcp_recv_cc() removes the node from the connecting list and links it
back into local->sockets, where the stale bind-time entry makes the node
point to itself. Every later sk_for_each() over local->sockets then spins
forever with the read lock held, which pins the CPU and stalls RCU, and
the socket is never freed.
Reject the connection while sk_node is still linked. A socket has to be
closed before it can be connected.
Reproduced on v7.4-rc3 as uid 1000: a soft lockup / RCU stall in
nfc_llcp_sock_from_sn() while walking local->sockets.
This issue was discovered by Tencent CodeBuddy Security.
Link: https://lore.kernel.org/all/20261009092338.3146149-1-bsdhenrymartin@gmail.com/
Fixes: a69f32af86e3 ("NFC: Socket linked list")
Cc: stable@vger.kernel.org
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
---
v1 -> v2: reject any socket that is still hashed (sk_hashed) instead of only
LLCP_BOUND, covering bind()+listen()+connect() and sockets left
linked after DISC/DM.
net/nfc/llcp_sock.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 1e5ee4bcde68..01b311d5adda 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -714,6 +714,15 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr_unsized *_addr
ret = -EINPROGRESS;
goto error;
}
+ /* A socket that is still linked in local->sockets must not be linked
+ * into local->connecting_sockets as well: both lists use sk_node, and
+ * the CC handler links the node back into local->sockets, which turns
+ * the stale entry into a self-loop.
+ */
+ if (sk_hashed(sk)) {
+ ret = -EISCONN;
+ goto error;
+ }
dev = nfc_get_device(addr->dev_idx);
if (dev == NULL) {
--
2.43.7
reply other threads:[~2026-11-20 7:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120075908.4064155-1-bsdhenrymartin@gmail.com \
--to=bsdhenrymartin@gmail.com \
--cc=davem@davemloft.net \
--cc=david@ixit.cz \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oe-linux-nfc@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox