From: Henry Martin <bsdhenrymartin@gmail.com>
To: David Heidelberg <david@ixit.cz>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>
Cc: oe-linux-nfc@lists.linux.dev, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Henry Martin <bsdhenrymartin@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] nfc: llcp: walk the accept queue under the socket lock
Date: Wed, 18 Nov 2026 16:38:11 +0800 [thread overview]
Message-ID: <20261118083811.1721010-1-bsdhenrymartin@gmail.com> (raw)
llcp_accept_poll() walks parent->accept_queue and reads each child's
sk_state without holding the socket lock. nfc_llcp_accept_dequeue()
unlinks closed children and drops their creation reference under that
lock, and the last sock_put() frees the child.
A poll() racing with accept() therefore reads a freed child:
BUG: KASAN: slab-use-after-free in llcp_sock_poll+0x440/0x4e0
Read of size 1 at addr ffff888112387812 by task poc.bin/528
Allocated by task 198:
nfc_llcp_sock_alloc
nfc_llcp_rx_skb
Freed by task 529:
__sk_destruct
nfc_llcp_accept_dequeue
Take the listener lock around the accept queue walk.
This issue was discovered by Tencent CodeBuddy Security.
Fixes: d646960f7986 ("NFC: Initial LLCP support")
Cc: stable@vger.kernel.org
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
---
net/nfc/llcp_sock.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 1e5ee4bcde68..3503f1a7a7cc 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -584,8 +584,16 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
sock_poll_wait(file, sock, wait);
- if (sk->sk_state == LLCP_LISTEN)
- return llcp_accept_poll(sk);
+ if (sk->sk_state == LLCP_LISTEN) {
+ /* nfc_llcp_accept_dequeue() unlinks and frees closed children
+ * under the listener lock, so the queue can only be walked
+ * with that lock held.
+ */
+ lock_sock(sk);
+ mask = llcp_accept_poll(sk);
+ release_sock(sk);
+ return mask;
+ }
if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
mask |= EPOLLERR |
--
2.43.7
next reply other threads:[~2026-11-18 8:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 8:38 Henry Martin [this message]
2026-11-18 11:05 ` Eric Dumazet
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=20261118083811.1721010-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=linux-kernel@vger.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
all inboxes | Powered by JetHome®