Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wireguard: receive: annotate data-race around receiving_counter.counter

Syzkaller with KCSAN identified a data-race issue when accessing
keypair->receiving_counter.counter. Use READ_ONCE() and WRITE_ONCE()
annotations to mark the data race as intentional.

BUG: KCSAN: data-race in wg_packet_decrypt_worker / wg_packet_rx_poll

write to 0xffff888107765888 of 8 bytes by interrupt on cpu 0:
counter_validate drivers/net/wireguard/receive.c:321 [inline]
wg_packet_rx_poll+0x3ac/0xf00 drivers/net/wireguard/receive.c:461
__napi_poll+0x60/0x3b0 net/core/dev.c:6536
napi_poll net/core/dev.c:6605 [inline]
net_rx_action+0x32b/0x750 net/core/dev.c:6738
__do_softirq+0xc4/0x279 kernel/softirq.c:553
do_softirq+0x5e/0x90 kernel/softirq.c:454
__local_bh_enable_ip+0x64/0x70 kernel/softirq.c:381
__raw_spin_unlock_bh include/linux/spinlock_api_smp.h:167 [inline]
_raw_spin_unlock_bh+0x36/0x40 kernel/locking/spinlock.c:210
spin_unlock_bh include/linux/spinlock.h:396 [inline]
ptr_ring_consume_bh include/linux/ptr_ring.h:367 [inline]
wg_packet_decrypt_worker+0x6c5/0x700 drivers/net/wireguard/receive.c:499
process_one_work kernel/workqueue.c:2633 [inline]
...

read to 0xffff888107765888 of 8 bytes by task 3196 on cpu 1:
decrypt_packet drivers/net/wireguard/receive.c:252 [inline]
wg_packet_decrypt_worker+0x220/0x700 drivers/net/wireguard/receive.c:501
process_one_work kernel/workqueue.c:2633 [inline]
process_scheduled_works+0x5b8/0xa30 kernel/workqueue.c:2706
worker_thread+0x525/0x730 kernel/workqueue.c:2787
...

Fixes: a9e90d9931f3 ("wireguard: noise: separate receive counter from send counter")
Reported-by: syzbot+d1de830e4ecdaac83d89@syzkaller.appspotmail.com
Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Nikita Zhandarovich and committed by
Paolo Abeni
bba045dc f6e0a498

+3 -3
+3 -3
drivers/net/wireguard/receive.c
··· 251 251 252 252 if (unlikely(!READ_ONCE(keypair->receiving.is_valid) || 253 253 wg_birthdate_has_expired(keypair->receiving.birthdate, REJECT_AFTER_TIME) || 254 - keypair->receiving_counter.counter >= REJECT_AFTER_MESSAGES)) { 254 + READ_ONCE(keypair->receiving_counter.counter) >= REJECT_AFTER_MESSAGES)) { 255 255 WRITE_ONCE(keypair->receiving.is_valid, false); 256 256 return false; 257 257 } ··· 318 318 for (i = 1; i <= top; ++i) 319 319 counter->backtrack[(i + index_current) & 320 320 ((COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1)] = 0; 321 - counter->counter = their_counter; 321 + WRITE_ONCE(counter->counter, their_counter); 322 322 } 323 323 324 324 index &= (COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1; ··· 463 463 net_dbg_ratelimited("%s: Packet has invalid nonce %llu (max %llu)\n", 464 464 peer->device->dev->name, 465 465 PACKET_CB(skb)->nonce, 466 - keypair->receiving_counter.counter); 466 + READ_ONCE(keypair->receiving_counter.counter)); 467 467 goto next; 468 468 } 469 469