* [PATCH net 0/2] nfc: llcp: clone LSM attributes; st21nfca: fix skb leak
@ 2026-11-12 10:04 Suyuan Wang via B4 Relay
2026-11-12 10:04 ` [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets Suyuan Wang via B4 Relay
2026-11-12 10:04 ` [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it Suyuan Wang via B4 Relay
0 siblings, 2 replies; 5+ messages in thread
From: Suyuan Wang via B4 Relay @ 2026-11-12 10:04 UTC (permalink / raw)
To: netdev, david
Cc: edumazet, kuba, horms, oe-linux-nfc, linux-kernel, pabeni, davem
Hi,
Two unrelated NFC fixes. Both came out of a static analysis run, and I
checked them by hand on next-20261109.
The first one makes LLCP accepted sockets inherit the listener's LSM
attributes. nfc_llcp_recv_connect() never calls security_sk_clone(),
which bluetooth, iucv and vsock all had to add for the same reason.
The second one plugs an skb leak in st21nfca: the ATR_REQ skb is never
freed after the HCI layer has copied it.
Both are compile tested only. I don't have ST21NFCA hardware, and I
haven't set up SELinux with an LLCP peer to test the first one.
Thanks,
Suyuan
---
Suyuan Wang (2):
nfc: llcp: Clone LSM attributes to newly created child sockets
nfc: st21nfca: Free the ATR_REQ skb after sending it
drivers/nfc/st21nfca/dep.c | 9 ++++++---
net/nfc/llcp_core.c | 3 +++
2 files changed, 9 insertions(+), 3 deletions(-)
---
base-commit: 630059a5a632377b9b7b487baccde92b7ae1dd47
change-id: 20261112-nfc-402434cf5f79
Best regards,
--
Suyuan Wang <shyckless@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets 2026-11-12 10:04 [PATCH net 0/2] nfc: llcp: clone LSM attributes; st21nfca: fix skb leak Suyuan Wang via B4 Relay @ 2026-11-12 10:04 ` Suyuan Wang via B4 Relay 2026-11-18 18:16 ` Simon Horman 2026-11-12 10:04 ` [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it Suyuan Wang via B4 Relay 1 sibling, 1 reply; 5+ messages in thread From: Suyuan Wang via B4 Relay @ 2026-11-12 10:04 UTC (permalink / raw) To: netdev, david Cc: edumazet, kuba, horms, oe-linux-nfc, linux-kernel, pabeni, davem From: Suyuan Wang <stevewong@hust.edu.cn> nfc_llcp_recv_connect() creates the child socket for an incoming CONNECT and queues it for accept(), but never calls security_sk_clone(): new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type, GFP_ATOMIC, 0); ... new_sock = nfc_llcp_sock(new_sk); So the accepted socket doesn't inherit the LSM state of the listening socket. With SELinux, its sock keeps the unlabeled SID. The sock_has_perm() checks on it (sendmsg, recvmsg and so on) still run, but against that SID instead of the server's. Depending on the policy, this can deny a confined server on its own accepted sockets, or allow something the server's own label wouldn't. Call security_sk_clone() right after the child is allocated, before it is set up and queued for accept(). Bluetooth, iucv and vsock fixed the same problem the same way, in commit 6230c9b4f895 ("bluetooth: Properly clone LSM attributes to newly created child connections"), commit 02f06918156b ("iucv: properly clone LSM attributes to newly created child sockets") and commit 1f935e8e72ec ("selinux: vsock: Set SID for socket returned by accept()"). Found with a static analysis tool and checked by hand. Fixes: d646960f7986 ("NFC: Initial LLCP support") Cc: stable@vger.kernel.org Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> Signed-off-by: Suyuan Wang <stevewong@hust.edu.cn> --- Compile tested only, I haven't tried it with an SELinux policy and a real LLCP peer. --- net/nfc/llcp_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 74bf817007cf..0f54548a47cc 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -10,6 +10,7 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/nfc.h> +#include <linux/security.h> #include "nfc.h" #include "llcp.h" @@ -1006,6 +1007,8 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local, goto fail; } + security_sk_clone(parent, new_sk); + new_sock = nfc_llcp_sock(new_sk); new_sock->local = nfc_llcp_local_get(local); -- 2.34.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets 2026-11-12 10:04 ` [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets Suyuan Wang via B4 Relay @ 2026-11-18 18:16 ` Simon Horman 0 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2026-11-18 18:16 UTC (permalink / raw) To: shyckless Cc: netdev, david, edumazet, kuba, oe-linux-nfc, linux-kernel, pabeni, davem On Thu, Nov 12, 2026 at 10:04:48AM +0000, Suyuan Wang via B4 Relay wrote: > From: Suyuan Wang <stevewong@hust.edu.cn> > > nfc_llcp_recv_connect() creates the child socket for an incoming > CONNECT and queues it for accept(), but never calls security_sk_clone(): > > new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type, GFP_ATOMIC, 0); > ... > new_sock = nfc_llcp_sock(new_sk); > > So the accepted socket doesn't inherit the LSM state of the listening > socket. With SELinux, its sock keeps the unlabeled SID. The > sock_has_perm() checks on it (sendmsg, recvmsg and so on) still run, > but against that SID instead of the server's. Depending on the policy, > this can deny a confined server on its own accepted sockets, or allow > something the server's own label wouldn't. > > Call security_sk_clone() right after the child is allocated, before it > is set up and queued for accept(). Bluetooth, iucv and vsock fixed the > same problem the same way, in commit 6230c9b4f895 ("bluetooth: Properly > clone LSM attributes to newly created child connections"), > commit 02f06918156b ("iucv: properly clone LSM attributes to newly > created child sockets") and commit 1f935e8e72ec ("selinux: vsock: Set > SID for socket returned by accept()"). > > Found with a static analysis tool and checked by hand. > > Fixes: d646960f7986 ("NFC: Initial LLCP support") > Cc: stable@vger.kernel.org > Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> > Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> > Signed-off-by: Suyuan Wang <stevewong@hust.edu.cn> > --- > Compile tested only, I haven't tried it with an SELinux policy and a > real LLCP peer. > --- Reviewed-by: Simon Horman <horms@kernel.org> ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it 2026-11-12 10:04 [PATCH net 0/2] nfc: llcp: clone LSM attributes; st21nfca: fix skb leak Suyuan Wang via B4 Relay 2026-11-12 10:04 ` [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets Suyuan Wang via B4 Relay @ 2026-11-12 10:04 ` Suyuan Wang via B4 Relay 2026-11-18 18:16 ` Simon Horman 1 sibling, 1 reply; 5+ messages in thread From: Suyuan Wang via B4 Relay @ 2026-11-12 10:04 UTC (permalink / raw) To: netdev, david Cc: edumazet, kuba, horms, oe-linux-nfc, linux-kernel, pabeni, davem From: Suyuan Wang <stevewong@hust.edu.cn> st21nfca_im_send_atr_req() allocates an skb for the ATR_REQ, passes its data to the HCI layer and then forgets about it: return nfc_hci_send_cmd_async(hdev, ST21NFCA_RF_READER_F_GATE, ST21NFCA_WR_XCHG_DATA, skb->data, skb->len, info->async_cb, info); nfc_hci_send_cmd_async() copies the payload into its own fragments, so the skb is still ours to free. As it is, one skb leaks on every ATR_REQ sent in initiator mode, whether or not the command was queued. Free it right after the call, on success and on error, as st21nfca_tx_work() does for the same call. Found with a static analysis tool and checked by hand. Fixes: 1892bf844ea0 ("NFC: st21nfca: Adding P2P support to st21nfca in Initiator & Target mode") Cc: stable@vger.kernel.org Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> Signed-off-by: Suyuan Wang <stevewong@hust.edu.cn> --- Compile tested only, I don't have ST21NFCA hardware. --- drivers/nfc/st21nfca/dep.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c index a5fab4fd5129..4b9054eb0208 100644 --- a/drivers/nfc/st21nfca/dep.c +++ b/drivers/nfc/st21nfca/dep.c @@ -496,6 +496,7 @@ int st21nfca_im_send_atr_req(struct nfc_hci_dev *hdev, u8 *gb, size_t gb_len) struct st21nfca_atr_req *atr_req; struct nfc_target *target; uint size; + int r; info->dep_info.to = ST21NFCA_DEFAULT_TIMEOUT; size = ST21NFCA_ATR_REQ_MIN_SIZE + gb_len; @@ -547,9 +548,11 @@ int st21nfca_im_send_atr_req(struct nfc_hci_dev *hdev, u8 *gb, size_t gb_len) info->dep_info.bsi = atr_req->bsi; info->dep_info.lri = ST21NFCA_PP2LRI(atr_req->ppi); - return nfc_hci_send_cmd_async(hdev, ST21NFCA_RF_READER_F_GATE, - ST21NFCA_WR_XCHG_DATA, skb->data, - skb->len, info->async_cb, info); + r = nfc_hci_send_cmd_async(hdev, ST21NFCA_RF_READER_F_GATE, + ST21NFCA_WR_XCHG_DATA, skb->data, + skb->len, info->async_cb, info); + kfree_skb(skb); + return r; } EXPORT_SYMBOL(st21nfca_im_send_atr_req); -- 2.34.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it 2026-11-12 10:04 ` [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it Suyuan Wang via B4 Relay @ 2026-11-18 18:16 ` Simon Horman 0 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2026-11-18 18:16 UTC (permalink / raw) To: shyckless Cc: netdev, david, edumazet, kuba, oe-linux-nfc, linux-kernel, pabeni, davem On Thu, Nov 12, 2026 at 10:04:49AM +0000, Suyuan Wang via B4 Relay wrote: > From: Suyuan Wang <stevewong@hust.edu.cn> > > st21nfca_im_send_atr_req() allocates an skb for the ATR_REQ, passes > its data to the HCI layer and then forgets about it: > > return nfc_hci_send_cmd_async(hdev, ST21NFCA_RF_READER_F_GATE, > ST21NFCA_WR_XCHG_DATA, skb->data, > skb->len, info->async_cb, info); > > nfc_hci_send_cmd_async() copies the payload into its own fragments, so > the skb is still ours to free. As it is, one skb leaks on every ATR_REQ > sent in initiator mode, whether or not the command was queued. > > Free it right after the call, on success and on error, as > st21nfca_tx_work() does for the same call. > > Found with a static analysis tool and checked by hand. > > Fixes: 1892bf844ea0 ("NFC: st21nfca: Adding P2P support to st21nfca in Initiator & Target mode") > Cc: stable@vger.kernel.org > Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> > Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg> > Signed-off-by: Suyuan Wang <stevewong@hust.edu.cn> > --- > Compile tested only, I don't have ST21NFCA hardware. Reviewed-by: Simon Horman <horms@kernel.org> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-18 18:16 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2026-11-12 10:04 [PATCH net 0/2] nfc: llcp: clone LSM attributes; st21nfca: fix skb leak Suyuan Wang via B4 Relay 2026-11-12 10:04 ` [PATCH net 1/2] nfc: llcp: Clone LSM attributes to newly created child sockets Suyuan Wang via B4 Relay 2026-11-18 18:16 ` Simon Horman 2026-11-12 10:04 ` [PATCH net 2/2] nfc: st21nfca: Free the ATR_REQ skb after sending it Suyuan Wang via B4 Relay 2026-11-18 18:16 ` Simon Horman
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®