]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
net/packet: avoid fanout hook re-registration after unregister
authorDavid Lee <david.lee@trailofbits.com>
Tue, 7 Jul 2026 10:44:37 +0000 (10:44 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 21 Jul 2026 01:15:20 +0000 (18:15 -0700)
commit50aff80475abd3533eef4320477037e6fcc6b56e
treef0bba4fbeca108acbed5c511a8278537136b53e6
parentf6e3b21608e974c4aaa4cfd73a239dacf1d8a9a3
net/packet: avoid fanout hook re-registration after unregister

packet_set_ring() temporarily detaches a socket from packet delivery while
reconfiguring its ring. It records the previous running state, clears
po->num, unregisters the protocol hook when needed, drops po->bind_lock,
and later restores po->num and re-registers the hook from the saved
was_running value.

That unlocked window can race with NETDEV_UNREGISTER. The notifier can
observe the socket as not running, skip __unregister_prot_hook(), and
invalidate the per-socket binding by setting po->ifindex to -1 and clearing
po->prot_hook.dev. A one-member fanout group can still retain its shared
fanout hook device pointer. When packet_set_ring() resumes, re-registering
solely from the stale was_running state can re-add the fanout hook after
the device has been unregistered.

Treat po->ifindex == -1 as an invalidated binding after reacquiring
po->bind_lock. This is distinct from ifindex 0, the normal
unbound/wildcard state: ifindex -1 marks an existing device binding that
was invalidated when the device was unregistered. Restore po->num as
before, but do not re-register the hook if device unregister already
detached the socket.

Fixes: dc99f600698d ("packet: Add fanout support.")
Link: https://lore.kernel.org/netdev/20260701113947.23180-1-david.lee@trailofbits.com/
Signed-off-by: David Lee <david.lee@trailofbits.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260707104440.833129-1-david.lee@trailofbits.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/packet/af_packet.c