iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/ipv4
History
Eric Dumazet be59b87ee4 net: tunnels: annotate lockless accesses to dev->needed_headroom 
[ Upstream commit 4b397c06cb987935b1b097336532aa6b4210e091 ]

IP tunnels can apparently update dev->needed_headroom
in their xmit path.

This patch takes care of three tunnels xmit, and also the
core LL_RESERVED_SPACE() and LL_RESERVED_SPACE_EXTRA()
helpers.

More changes might be needed for completeness.

BUG: KCSAN: data-race in ip_tunnel_xmit / ip_tunnel_xmit

read to 0xffff88815b9da0ec of 2 bytes by task 888 on cpu 1:
ip_tunnel_xmit+0x1270/0x1730 net/ipv4/ip_tunnel.c:803
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228
ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430
dst_output include/net/dst.h:444 [inline]
ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126
iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82
ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246

write to 0xffff88815b9da0ec of 2 bytes by task 2379 on cpu 0:
ip_tunnel_xmit+0x1294/0x1730 net/ipv4/ip_tunnel.c:804
__gre_xmit net/ipv4/ip_gre.c:469 [inline]
ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661
__netdev_start_xmit include/linux/netdevice.h:4881 [inline]
netdev_start_xmit include/linux/netdevice.h:4895 [inline]
xmit_one net/core/dev.c:3580 [inline]
dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596
__dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
dev_queue_xmit include/linux/netdevice.h:3051 [inline]
neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623
neigh_output include/net/neighbour.h:546 [inline]
ip6_finish_output2+0x9bc/0xc50 net/ipv6/ip6_output.c:134
__ip6_finish_output net/ipv6/ip6_output.c:195 [inline]
ip6_finish_output+0x39a/0x4e0 net/ipv6/ip6_output.c:206
NF_HOOK_COND include/linux/netfilter.h:291 [inline]
ip6_output+0xeb/0x220 net/ipv6/ip6_output.c:227
dst_output include/net/dst.h:444 [inline]
NF_HOOK include/linux/netfilter.h:302 [inline]
mld_sendpack+0x438/0x6a0 net/ipv6/mcast.c:1820
mld_send_cr net/ipv6/mcast.c:2121 [inline]
mld_ifc_work+0x519/0x7b0 net/ipv6/mcast.c:2653
process_one_work+0x3e6/0x750 kernel/workqueue.c:2390
worker_thread+0x5f2/0xa10 kernel/workqueue.c:2537
kthread+0x1ac/0x1e0 kernel/kthread.c:376
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:308

value changed: 0x0dd4 -> 0x0e14

Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 2379 Comm: kworker/0:0 Not tainted 6.3.0-rc1-syzkaller-00002-g8ca09d5fa354-dirty #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023
Workqueue: mld mld_ifc_work

Fixes: 8eb30be0352d ("ipv6: Create ip6_tnl_xmit")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230310191109.2384387-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-03-22 13:29:58 +01:00
..
bpfilter
net: Revert "net: optimize the sockptr_t for unified kernel/user address spaces"
2020-08-10 12:06:44 -07:00
netfilter
netfilter: tproxy: fix deadlock due to missing BH disable
2023-03-17 08:45:11 +01:00
af_inet.c
net: remove cmsg restriction from io_uring based send/recvmsg calls
2023-01-04 11:39:24 +01:00
ah4.c
xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume
2021-04-14 08:42:05 +02:00
arp.c
ipv4: Invalidate neighbour for broadcast address upon address addition
2022-04-13 21:00:57 +02:00
bpf_tcp_ca.c
bpf: Change bpf_sk_storage_*() to accept ARG_PTR_TO_BTF_ID_SOCK_COMMON
2020-09-25 13:58:01 -07:00
cipso_ipv4.c
cipso: Fix data-races around sysctl.
2022-07-21 21:20:08 +02:00
datagram.c
udp: Update reuse->has_conns under reuseport_lock.
2022-10-30 09:41:19 +01:00
devinet.c
net: socket: remove register_gifconf
2022-09-28 11:10:35 +02:00
esp4_offload.c
xfrm: replay: Fix ESN wrap around for GSO
2022-12-02 17:39:58 +01:00
esp4.c
esp: limit skb_page_frag_refill use to a single page
2022-04-27 13:53:48 +02:00
fib_frontend.c
ipv4: Fix incorrect route flushing when table ID 0 is used
2022-12-14 11:32:04 +01:00
fib_lookup.h
…
fib_notifier.c
…
fib_rules.c
ipv4: convert fib_num_tclassid_users to atomic_t
2021-12-08 09:03:26 +01:00
fib_semantics.c
ipv4: prevent potential spectre v1 gadget in fib_metrics_match()
2023-02-01 08:23:25 +01:00
fib_trie.c
ipv4: Fix error return code in fib_table_insert()
2022-12-02 17:40:01 +01:00
fou.c
genetlink: move to smaller ops wherever possible
2020-10-02 19:11:11 -07:00
gre_demux.c
erspan: fix version 1 check in gre_parse_header()
2021-01-12 20:18:12 +01:00
gre_offload.c
net: gre: recompute gre csum for sctp over gre tunnels
2020-08-03 15:29:44 -07:00
icmp.c
ip: Fix data-races around sysctl_ip_no_pmtu_disc.
2022-07-29 17:19:12 +02:00
igmp.c
igmp: Fix data-races around sysctl_igmp_qrv.
2022-08-03 12:00:46 +02:00
inet_connection_sock.c
tcp: Fix listen() regression in 5.10.163
2023-03-11 16:40:19 +01:00
inet_diag.c
inet_diag: fix kernel-infoleak for UDP sockets
2021-12-22 09:30:53 +01:00
inet_fragment.c
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 10:54:33 +01:00
inet_hashtables.c
inet: fix fast path in __inet_hash_connect()
2023-03-11 16:39:50 +01:00
inet_timewait_sock.c
tcp: avoid the lookup process failing to get sk in ehash table
2023-02-01 08:23:15 +01:00
inetpeer.c
inetpeer: Fix data-races around sysctl.
2022-07-21 21:20:07 +02:00
ip_forward.c
ip: Fix data-races around sysctl_ip_fwd_update_priority.
2022-07-29 17:19:12 +02:00
ip_fragment.c
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 10:54:33 +01:00
ip_gre.c
ip_gre: do not report erspan version on GRE interface
2022-12-14 11:32:03 +01:00
ip_input.c
xfrm: fix "disable_policy" on ipv4 early demux
2022-12-02 17:39:58 +01:00
ip_options.c
net: clean up codestyle for net/ipv4
2020-08-25 06:28:02 -07:00
ip_output.c
net: Fix data-races around sysctl_[rw]mem_(max|default).
2022-08-31 17:15:19 +02:00
ip_sockglue.c
net: Fix data-races around sysctl_optmem_max.
2022-08-31 17:15:20 +02:00
ip_tunnel_core.c
tunnels: do not assume mac header is set in skb_tunnel_check_pmtu()
2022-07-07 17:52:19 +02:00
ip_tunnel.c
net: tunnels: annotate lockless accesses to dev->needed_headroom
2023-03-22 13:29:58 +01:00
ip_vti.c
net: always use icmp{,v6}_ndo_send from ndo_start_xmit
2021-03-17 17:06:12 +01:00
ipcomp.c
ipcomp: assign if_id to child tunnel from parent tunnel
2020-07-09 12:55:37 +02:00
ipconfig.c
net: ipconfig: Don't override command-line hostnames or domains
2021-06-18 10:00:05 +02:00
ipip.c
net: ipip: implement header_ops->parse_protocol for AF_PACKET
2020-06-30 12:29:39 -07:00
ipmr_base.c
…
ipmr.c
ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path
2022-02-16 12:54:25 +01:00
Kconfig
tcp: configurable source port perturb table size
2022-12-02 17:40:05 +01:00
Makefile
udp_tunnel: add central NIC RX port offload infrastructure
2020-07-10 13:54:00 -07:00
metrics.c
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
2023-02-01 08:23:24 +01:00
netfilter.c
netfilter: use actual socket sk rather than skb sk when routing harder
2020-10-30 12:57:39 +01:00
netlink.c
…
nexthop.c
nh: fix scope used to find saddr when adding non gw nh
2022-11-03 23:57:54 +09:00
ping.c
lsm,selinux: pass flowi_common instead of flowi to the LSM hooks
2022-06-09 10:21:09 +02:00
proc.c
tcp: switch orphan_count to bare per-cpu counters
2021-11-18 14:04:08 +01:00
protocol.c
…
raw_diag.c
…
raw.c
lsm,selinux: pass flowi_common instead of flowi to the LSM hooks
2022-06-09 10:21:09 +02:00
route.c
ip: Fix data-races around sysctl_ip_fwd_use_pmtu.
2022-07-29 17:19:12 +02:00
syncookies.c
mptcp: remove MPTCP 'ifdef' in TCP SYN cookies
2023-01-14 10:16:51 +01:00
sysctl_net_ipv4.c
tcp/udp: Make early_demux back namespacified.
2022-11-10 18:14:26 +01:00
tcp_bbr.c
tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
2021-08-18 08:59:13 +02:00
tcp_bic.c
…
tcp_bpf.c
bpf, sockmap: Check for any of tcp_bpf_prots when cloning a listener
2023-02-15 17:22:10 +01:00
tcp_cdg.c
tcp: cdg: allow tcp_cdg_release() to be called multiple times
2022-11-25 17:45:55 +01:00
tcp_cong.c
net: Only allow init netns to set default tcp cong to a restricted algo
2021-05-14 09:50:46 +02:00
tcp_cubic.c
tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows
2021-12-01 09:19:06 +01:00
tcp_dctcp.c
…
tcp_dctcp.h
…
tcp_diag.c
…
tcp_fastopen.c
tcp: Fix data-races around sysctl_tcp_fastopen_blackhole_timeout.
2022-07-29 17:19:18 +02:00
tcp_highspeed.c
Replace HTTP links with HTTPS ones: IPv*
2020-07-06 13:23:03 -07:00
tcp_htcp.c
Replace HTTP links with HTTPS ones: IPv*
2020-07-06 13:23:03 -07:00
tcp_hybla.c
…
tcp_illinois.c
…
tcp_input.c
tcp: fix indefinite deferral of RTO with SACK reneging
2022-11-03 23:57:52 +09:00
tcp_ipv4.c
dccp/tcp: Reset saddr on failure after inet6?_hash_connect().
2022-12-02 17:40:01 +01:00
tcp_lp.c
…
tcp_metrics.c
tcp: Fix data-races around sysctl_tcp_no_ssthresh_metrics_save.
2022-08-03 12:00:45 +02:00
tcp_minisocks.c
tcp: tcp_check_req() can be called from process context
2023-03-11 16:40:13 +01:00
tcp_nv.c
…
tcp_offload.c
net, gro: Set inner transport header offset in tcp/udp GRO hook
2021-08-12 13:22:05 +02:00
tcp_output.c
tcp: tcp_make_synack() can be called from process context
2023-03-22 13:29:57 +01:00
tcp_rate.c
tcp: ensure to use the most recently sent skb when filling the rate sample
2022-05-09 09:05:03 +02:00
tcp_recovery.c
tcp: Fix data-races around sysctl_tcp_recovery.
2022-07-29 17:19:21 +02:00
tcp_scalable.c
net: ipv4: delete repeated words
2020-08-24 17:31:20 -07:00
tcp_timer.c
tcp: Fix a data-race around sysctl_tcp_thin_linear_timeouts.
2022-07-29 17:19:21 +02:00
tcp_ulp.c
net/ulp: use consistent error code when blocking ULP
2023-01-24 07:20:01 +01:00
tcp_vegas.c
tcp: use semicolons rather than commas to separate statements
2020-10-13 17:11:52 -07:00
tcp_vegas.h
…
tcp_veno.c
Replace HTTP links with HTTPS ones: IPv*
2020-07-06 13:23:03 -07:00
tcp_westwood.c
…
tcp_yeah.c
…
tcp.c
tcp: fix rate_app_limited to default to 1
2023-02-01 08:23:16 +01:00
tunnel4.c
tunnel4: add cb_handler to struct xfrm_tunnel
2020-07-09 12:51:36 +02:00
udp_bpf.c
bpf, sockmap, udp: sk_prot needs inuse_idx set for proc stats
2021-07-28 14:35:37 +02:00
udp_diag.c
…
udp_impl.h
net: pass a sockptr_t into ->setsockopt
2020-07-24 15:41:54 -07:00
udp_offload.c
net, gro: Set inner transport header offset in tcp/udp GRO hook
2021-08-12 13:22:05 +02:00
udp_tunnel_core.c
net/tunnel: wait until all sk_user_data reader finish before releasing the sock
2023-01-14 10:15:43 +01:00
udp_tunnel_nic.c
udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister()
2022-03-02 11:42:51 +01:00
udp_tunnel_stub.c
udp_tunnel: add central NIC RX port offload infrastructure
2020-07-10 13:54:00 -07:00
udp.c
udp: Update reuse->has_conns under reuseport_lock.
2022-10-30 09:41:19 +01:00
udplite.c
net/ipv4: remove compat_ip_{get,set}sockopt
2020-07-19 18:16:41 -07:00
xfrm4_input.c
…
xfrm4_output.c
…
xfrm4_policy.c
…
xfrm4_protocol.c
net: xfrm: unexport __init-annotated xfrm4_protocol_init()
2022-06-14 18:32:40 +02:00
xfrm4_state.c
…
xfrm4_tunnel.c
xfrm: interface: fix the priorities for ipip and ipv6 tunnels
2020-10-09 12:29:48 +02:00