Eric Dumazet
6b307f5c03
net: icmp: fix data-race in cmp_global_allow()
...
commit bbab7ef235031f6733b5429ae7877bfa22339712 upstream.
This code reads two global variables without protection
of a lock. We need READ_ONCE()/WRITE_ONCE() pairs to
avoid load/store-tearing and better document the intent.
KCSAN reported :
BUG: KCSAN: data-race in icmp_global_allow / icmp_global_allow
read to 0xffffffff861a8014 of 4 bytes by task 11201 on cpu 0:
icmp_global_allow+0x36/0x1b0 net/ipv4/icmp.c:254
icmpv6_global_allow net/ipv6/icmp.c:184 [inline]
icmpv6_global_allow net/ipv6/icmp.c:179 [inline]
icmp6_send+0x493/0x1140 net/ipv6/icmp.c:514
icmpv6_send+0x71/0xb0 net/ipv6/ip6_icmp.c:43
ip6_link_failure+0x43/0x180 net/ipv6/route.c:2640
dst_link_failure include/net/dst.h:419 [inline]
vti_xmit net/ipv4/ip_vti.c:243 [inline]
vti_tunnel_xmit+0x27f/0xa50 net/ipv4/ip_vti.c:279
__netdev_start_xmit include/linux/netdevice.h:4420 [inline]
netdev_start_xmit include/linux/netdevice.h:4434 [inline]
xmit_one net/core/dev.c:3280 [inline]
dev_hard_start_xmit+0xef/0x430 net/core/dev.c:3296
__dev_queue_xmit+0x14c9/0x1b60 net/core/dev.c:3873
dev_queue_xmit+0x21/0x30 net/core/dev.c:3906
neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530
neigh_output include/net/neighbour.h:511 [inline]
ip6_finish_output2+0x7a6/0xec0 net/ipv6/ip6_output.c:116
__ip6_finish_output net/ipv6/ip6_output.c:142 [inline]
__ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127
ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152
NF_HOOK_COND include/linux/netfilter.h:294 [inline]
ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175
dst_output include/net/dst.h:436 [inline]
ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179
write to 0xffffffff861a8014 of 4 bytes by task 11183 on cpu 1:
icmp_global_allow+0x174/0x1b0 net/ipv4/icmp.c:272
icmpv6_global_allow net/ipv6/icmp.c:184 [inline]
icmpv6_global_allow net/ipv6/icmp.c:179 [inline]
icmp6_send+0x493/0x1140 net/ipv6/icmp.c:514
icmpv6_send+0x71/0xb0 net/ipv6/ip6_icmp.c:43
ip6_link_failure+0x43/0x180 net/ipv6/route.c:2640
dst_link_failure include/net/dst.h:419 [inline]
vti_xmit net/ipv4/ip_vti.c:243 [inline]
vti_tunnel_xmit+0x27f/0xa50 net/ipv4/ip_vti.c:279
__netdev_start_xmit include/linux/netdevice.h:4420 [inline]
netdev_start_xmit include/linux/netdevice.h:4434 [inline]
xmit_one net/core/dev.c:3280 [inline]
dev_hard_start_xmit+0xef/0x430 net/core/dev.c:3296
__dev_queue_xmit+0x14c9/0x1b60 net/core/dev.c:3873
dev_queue_xmit+0x21/0x30 net/core/dev.c:3906
neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530
neigh_output include/net/neighbour.h:511 [inline]
ip6_finish_output2+0x7a6/0xec0 net/ipv6/ip6_output.c:116
__ip6_finish_output net/ipv6/ip6_output.c:142 [inline]
__ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127
ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152
NF_HOOK_COND include/linux/netfilter.h:294 [inline]
ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 11183 Comm: syz-executor.2 Not tainted 5.4.0-rc3+ #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Fixes: 4cdf507d5452 ("icmp: add a global rate limitation")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-01-04 14:00:08 +01:00
..
2018-10-03 17:00:47 -07:00
2019-07-31 07:28:39 +02:00
2017-11-02 11:10:55 +01:00
2019-05-16 19:42:34 +02:00
2019-12-17 20:38:59 +01:00
2019-11-10 11:25:34 +01:00
2019-10-05 12:47:43 +02:00
2019-09-21 07:15:35 +02:00
2019-12-31 12:37:19 +01:00
2020-01-04 14:00:06 +01:00
2019-11-10 11:25:34 +01:00
2019-07-21 09:04:22 +02:00
2019-08-29 08:26:42 +02:00
2020-01-04 13:59:59 +01:00
2018-09-19 22:43:43 +02:00
2019-11-10 11:25:37 +01:00
2019-12-05 15:37:56 +01:00
2018-07-22 14:28:49 +02:00
2019-11-10 11:25:32 +01:00
2019-03-19 13:13:22 +01:00
2019-10-05 12:47:44 +02:00
2018-04-29 11:33:13 +02:00
2020-01-04 14:00:08 +01:00
2019-12-01 09:14:14 +01:00
2017-11-02 11:10:55 +01:00
2018-03-31 18:10:41 +02:00
2019-04-17 08:37:45 +02:00
2019-09-16 08:20:44 +02:00
2019-08-09 17:53:35 +02:00
2019-06-22 08:16:14 +02:00
2019-11-20 17:59:59 +01:00
2019-12-31 12:37:49 +01:00
2018-09-09 19:55:52 +02:00
2019-03-13 14:03:09 -07:00
2017-10-21 01:56:38 +01:00
2020-01-04 13:59:59 +01:00
2019-03-13 14:03:08 -07:00
2019-04-03 06:25:08 +02:00
2019-07-31 07:28:46 +02:00
2019-12-31 12:36:41 +01:00
2018-07-22 14:28:49 +02:00
2019-12-21 10:47:34 +01:00
2019-12-31 12:36:38 +01:00
2019-11-10 11:25:34 +01:00
2019-12-05 15:38:15 +01:00
2019-10-05 12:47:40 +02:00
2019-10-07 18:55:20 +02:00
2019-12-31 12:37:21 +01:00
2019-05-02 09:40:34 +02:00
2019-11-06 12:43:37 +01:00
2019-12-05 15:38:19 +01:00
2019-12-31 12:36:43 +01:00
2019-12-17 20:38:01 +01:00
2018-07-22 14:28:47 +02:00
2019-12-17 20:40:00 +01:00
2017-08-07 14:48:48 -07:00
2019-12-21 10:47:35 +01:00
2018-12-05 19:41:11 +01:00
2019-12-01 09:13:35 +01:00
2019-12-05 15:37:24 +01:00
2017-11-02 11:10:55 +01:00
2019-12-01 09:14:15 +01:00
2019-12-17 20:38:25 +01:00
2019-12-17 20:37:28 +01:00
2019-01-09 17:14:46 +01:00
2017-09-04 13:25:20 +02:00
2017-11-02 11:10:55 +01:00
2019-08-25 10:50:02 +02:00