net/packet: fix a race in packet_set_ring() and packet_notifier()
Subsystems (4)
Willem de Bruijn
maintainerPATCH v2 1/1 net/packet: fix a race in packet_set_ring() and packet_notifier()
From: Quang Le <[email protected]>
When packet_set_ring() releases po->bind_lock, another thread can run packet_notifier() and process an NETDEV_UP event.
This race and the fix are both similar to that of commit 15fe076edea7 ("net/packet: fix a race in packet_bind() and packet_notifier()").
There too the packet_notifier NETDEV_UP event managed to run while a po->bind_lock critical section had to be temporarily released. And the fix was similarly to temporarily set po->num to zero to keep the socket unhooked until the lock is retaken.
The po->bind_lock in packet_set_ring and packet_notifier precede the introduction of git history.
---
v1->v2:
- fix author attribution (From: at the top)
v1: https://lore.kernel.org/netdev/[email protected]/
--- net/packet/af_packet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/packet/af_packet.c +6 -6
@@ -4573,10 +4573,10 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,spin_lock (&po->bind_lock); was_running =packet_sock_flag (po,PACKET_SOCK_RUNNING ); num = po->num; -if (was_running) { -WRITE_ONCE (po->num,0 ); +WRITE_ONCE (po->num,0 ); +if (was_running)__unregister_prot_hook (sk, false); - } +spin_unlock (&po->bind_lock);synchronize_net ();
@@ -4608,10 +4608,10 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,mutex_unlock (&po->pg_vec_lock);spin_lock (&po->bind_lock); -if (was_running) { -WRITE_ONCE (po->num, num); +WRITE_ONCE (po->num, num); +if (was_running)register_prot_hook (sk); - } +spin_unlock (&po->bind_lock);if (pg_vec && (po->tp_version >TPACKET_V2 )) {/* Because we don't support block-based V3 on tx-ring */
Signature · 1 line
2.50.1.565.gc32cd1483b-goog
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 1 Aug 2025 13:54:16 -0400 you wrote:
From: Quang Le <[email protected]>
When
packet_set_ring()releasespo->bind_lock, another thread can runpacket_notifier()and process anNETDEV_UPevent.This race and the fix are both similar to that of commit
15fe076edea7("net/packet: fix a race inpacket_bind()andpacket_notifier()").[...]
Here is the summary with links:
- [net,v2] net/packet: fix a race in packet_set_ring() and packet_notifier()
https://git.kernel.org/netdev/net/c/01d3c8417b9c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html