Skip to content

Commit 7efb206

Browse files
committed
netpoll: Fix race condition in netpoll_owner_active
jira LE-3201 cve CVE-2024-41005 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.22.1.rt7.363.el8_10 commit-author Breno Leitao <leitao@debian.org> commit c2e6a87 KCSAN detected a race condition in netpoll: BUG: KCSAN: data-race in net_rx_action / netpoll_send_skb write (marked) to 0xffff8881164168b0 of 4 bytes by interrupt on cpu 10: net_rx_action (./include/linux/netpoll.h:90 net/core/dev.c:6712 net/core/dev.c:6822) <snip> read to 0xffff8881164168b0 of 4 bytes by task 1 on cpu 2: netpoll_send_skb (net/core/netpoll.c:319 net/core/netpoll.c:345 net/core/netpoll.c:393) netpoll_send_udp (net/core/netpoll.c:?) <snip> value changed: 0x0000000a -> 0xffffffff This happens because netpoll_owner_active() needs to check if the current CPU is the owner of the lock, touching napi->poll_owner non atomically. The ->poll_owner field contains the current CPU holding the lock. Use an atomic read to check if the poll owner is the current CPU. Signed-off-by: Breno Leitao <leitao@debian.org> Link: https://lore.kernel.org/r/20240429100437.3487432-1-leitao@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit c2e6a87) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 773ba5b commit 7efb206

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/core/netpoll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static int netpoll_owner_active(struct net_device *dev)
298298
struct napi_struct *napi;
299299

300300
list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {
301-
if (napi->poll_owner == smp_processor_id())
301+
if (READ_ONCE(napi->poll_owner) == smp_processor_id())
302302
return 1;
303303
}
304304
return 0;

0 commit comments

Comments
 (0)