xsk: fix init race causing NPD/UAF in xsk_create()
Subsystems (3)
PATCH 1/1 xsk: fix init race causing NPD/UAF in xsk_create()
xsk_init() registers the PF_XDP socket family before xsk_net_ops. This exposes .create = xsk_create() to user space while per-netns state (net->xdp.lock/list) is still uninitialized.
A task with CAP_NET_RAW can trigger this during boot/module load by calling socket(PF_XDP/AF_XDP, SOCK_RAW, 0) concurrently with xsk_init(), leading to NULL deref, list/lock corruption or use-after-free.
Register the pernet subsystem (and prerequisites) first and only then sock_register() PF_XDP. Update the error unwind to match the new order.
Similar to CVE-2024-26793 (GTP init ordering bug).
--- net/xdp/xsk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/xdp/xsk.c +6 -6
@@ -1922,10 +1922,6 @@ static int __init xsk_init(void)if (err) goto out; - err =sock_register (&xsk_family_ops); -if (err) - goto out_proto; - err =register_pernet_subsys (&xsk_net_ops);if (err) goto out_sk;
@@ -1942,16 +1938,20 @@ static int __init xsk_init(void) goto out_unreg_notif; } + err =sock_register (&xsk_family_ops); +if (err) + goto out_proto; +return 0 ; out_unreg_notif:unregister_netdevice_notifier (&xsk_netdev_notifier); out_pernet:unregister_pernet_subsys (&xsk_net_ops); -out_sk: -sock_unregister (PF_XDP ); out_proto:proto_unregister (&xsk_proto); +out_sk: +sock_unregister (PF_XDP ); out:return err; }
Signature · 1 line
2.34.1
[email protected]
AI reviewIf sock_register() fails here, does xsk_tx_generic_cache get leaked? The kmem_cache was successfully created just above this, but the error path at out_proto does not appear to call…
net/xdp/xsk.c static int __init xsk_init(void) · line 1943
Quoted 11 lines
net/xdp/xsk.c +3
-0@@ -1942,16 +1938,20 @@ static int __init xsk_init(void) goto out_unreg_notif; } + err =sock_register (&xsk_family_ops); +if (err) + goto out_proto;
If sock_register() fails here, does xsk_tx_generic_cache get leaked? The kmem_cache was successfully created just above this, but the error path at out_proto does not appear to call kmem_cache_destroy().
Looking at the error unwind below:
net/xdp/xsk.c static int __init xsk_init(void) · line 1952
Quoted 11 lines
net/xdp/xsk.c +1
-2+return 0 ; out_unreg_notif:unregister_netdevice_notifier (&xsk_netdev_notifier); out_pernet:unregister_pernet_subsys (&xsk_net_ops); -out_sk: -sock_unregister (PF_XDP ); out_proto:proto_unregister (&xsk_proto);
The path from sock_register() failure goes to out_proto, which only calls proto_unregister() before falling through. There is no kmem_cache_destroy() for xsk_tx_generic_cache in this error path.
Should there be a new label between out_unreg_notif and out_pernet that destroys the kmem_cache, and should out_proto jump there instead?
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/20815690741