iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c5fd77ca13d657c6e99bf04f0917445e6a80231e
linux/net/ipv4
History
Kuniyuki Iwashima c5fd77ca13 udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port(). 
[ Upstream commit 5c0b485a8c ]

syzkaller triggered the warning [0] in udp_v4_early_demux().

In udp_v[46]_early_demux() and sk_lookup(), we do not touch the refcount
of the looked-up sk and use sock_pfree() as skb->destructor, so we check
SOCK_RCU_FREE to ensure that the sk is safe to access during the RCU grace
period.

Currently, SOCK_RCU_FREE is flagged for a bound socket after being put
into the hash table.  Moreover, the SOCK_RCU_FREE check is done too early
in udp_v[46]_early_demux() and sk_lookup(), so there could be a small race
window:

  CPU1                                 CPU2
  ----                                 ----
  udp_v4_early_demux()                 udp_lib_get_port()
  |                                    |- hlist_add_head_rcu()
  |- sk = __udp4_lib_demux_lookup()    |
  |- DEBUG_NET_WARN_ON_ONCE(sk_is_refcounted(sk));
                                       `- sock_set_flag(sk, SOCK_RCU_FREE)

We had the same bug in TCP and fixed it in commit 871019b22d ("net:
set SOCK_RCU_FREE before inserting socket into hashtable").

Let's apply the same fix for UDP.

[0]:
WARNING: CPU: 0 PID: 11198 at net/ipv4/udp.c:2599 udp_v4_early_demux+0x481/0xb70 net/ipv4/udp.c:2599
Modules linked in:
CPU: 0 PID: 11198 Comm: syz-executor.1 Not tainted 6.9.0-g93bda33046e7 #13
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
RIP: 0010:udp_v4_early_demux+0x481/0xb70 net/ipv4/udp.c:2599
Code: c5 7a 15 fe bb 01 00 00 00 44 89 e9 31 ff d3 e3 81 e3 bf ef ff ff 89 de e8 2c 74 15 fe 85 db 0f 85 02 06 00 00 e8 9f 7a 15 fe <0f> 0b e8 98 7a 15 fe 49 8d 7e 60 e8 4f 39 2f fe 49 c7 46 60 20 52
RSP: 0018:ffffc9000ce3fa58 EFLAGS: 00010293
RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff8318c92c
RDX: ffff888036ccde00 RSI: ffffffff8318c2f1 RDI: 0000000000000001
RBP: ffff88805a2dd6e0 R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000000 R11: 0001ffffffffffff R12: ffff88805a2dd680
R13: 0000000000000007 R14: ffff88800923f900 R15: ffff88805456004e
FS:  00007fc449127640(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fc449126e38 CR3: 000000003de4b002 CR4: 0000000000770ef0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000600
PKRU: 55555554
Call Trace:
 <TASK>
 ip_rcv_finish_core.constprop.0+0xbdd/0xd20 net/ipv4/ip_input.c:349
 ip_rcv_finish+0xda/0x150 net/ipv4/ip_input.c:447
 NF_HOOK include/linux/netfilter.h:314 [inline]
 NF_HOOK include/linux/netfilter.h:308 [inline]
 ip_rcv+0x16c/0x180 net/ipv4/ip_input.c:569
 __netif_receive_skb_one_core+0xb3/0xe0 net/core/dev.c:5624
 __netif_receive_skb+0x21/0xd0 net/core/dev.c:5738
 netif_receive_skb_internal net/core/dev.c:5824 [inline]
 netif_receive_skb+0x271/0x300 net/core/dev.c:5884
 tun_rx_batched drivers/net/tun.c:1549 [inline]
 tun_get_user+0x24db/0x2c50 drivers/net/tun.c:2002
 tun_chr_write_iter+0x107/0x1a0 drivers/net/tun.c:2048
 new_sync_write fs/read_write.c:497 [inline]
 vfs_write+0x76f/0x8d0 fs/read_write.c:590
 ksys_write+0xbf/0x190 fs/read_write.c:643
 __do_sys_write fs/read_write.c:655 [inline]
 __se_sys_write fs/read_write.c:652 [inline]
 __x64_sys_write+0x41/0x50 fs/read_write.c:652
 x64_sys_call+0xe66/0x1990 arch/x86/include/generated/asm/syscalls_64.h:2
 do_syscall_x64 arch/x86/entry/common.c:52 [inline]
 do_syscall_64+0x4b/0x110 arch/x86/entry/common.c:83
 entry_SYSCALL_64_after_hwframe+0x4b/0x53
RIP: 0033:0x7fc44a68bc1f
Code: 89 54 24 18 48 89 74 24 10 89 7c 24 08 e8 e9 cf f5 ff 48 8b 54 24 18 48 8b 74 24 10 41 89 c0 8b 7c 24 08 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 31 44 89 c7 48 89 44 24 08 e8 3c d0 f5 ff 48
RSP: 002b:00007fc449126c90 EFLAGS: 00000293 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 00000000004bc050 RCX: 00007fc44a68bc1f
RDX: 0000000000000032 RSI: 00000000200000c0 RDI: 00000000000000c8
RBP: 00000000004bc050 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000032 R11: 0000000000000293 R12: 0000000000000000
R13: 000000000000000b R14: 00007fc44a5ec530 R15: 0000000000000000
 </TASK>

Fixes: 6acc9b432e ("bpf: Add helper to retrieve socket in BPF")
Reported-by: syzkaller <syzkaller@googlegroups.com>
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20240709191356.24010-1-kuniyu@amazon.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-07-18 13:21:14 +02:00
..
bpfilter
net: Use umd_cleanup_helper()
2023-05-31 13:06:57 +02:00
netfilter
netfilter: tproxy: bail out if IP has been disabled on the device
2024-06-12 11:12:57 +02:00
af_inet.c
net: relax socket state check at accept time.
2024-06-12 11:12:50 +02:00
ah4.c
net: ipv4: Remove completion function scaffolding
2023-02-13 18:35:15 +08:00
arp.c
arp: Prevent overflow in arp_req_get().
2024-03-01 13:35:08 +01:00
bpf_tcp_ca.c
bpf: Drop useless btf_vmlinux in bpf_tcp_ca
2023-07-18 17:31:10 -07:00
cipso_ipv4.c
cipso: fix total option length computation
2024-06-27 13:49:06 +02:00
datagram.c
ipv4: fix data-races around inet->inet_id
2023-08-20 11:40:49 +01:00
devinet.c
ipv4: properly combine dev_base_seq and ipv4.dev_addr_genid
2024-03-01 13:35:07 +01:00
esp4_offload.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-06-22 18:40:38 -07:00
esp4.c
net: esp: fix bad handling of pages from page_pool
2024-04-03 15:28:35 +02:00
fib_frontend.c
ipv4: Fix incorrect table ID in IOCTL path
2023-03-16 17:26:31 -07:00
fib_lookup.h
…
fib_notifier.c
…
fib_rules.c
ipv4: remove unnecessary type castings
2022-04-30 15:12:58 +01:00
fib_semantics.c
ipv4: fib: annotate races around nh->nh_saddr_genid and nh->nh_saddr
2023-10-18 18:11:31 -07:00
fib_trie.c
ipv4/fib: send notify when delete source address routes
2023-10-03 09:00:40 +02:00
fou_bpf.c
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
fou_core.c
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
fou_nl.c
net: ynl: prefix uAPI header include with uapi/
2023-05-26 10:30:14 +01:00
fou_nl.h
net: ynl: prefix uAPI header include with uapi/
2023-05-26 10:30:14 +01:00
gre_demux.c
…
gre_offload.c
net: move gso declarations and functions to their own files
2023-06-10 00:11:41 -07:00
icmp.c
icmp: prevent possible NULL dereferences from icmp_build_probe()
2024-05-02 16:32:35 +02:00
igmp.c
ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
2023-12-08 08:52:21 +01:00
inet_connection_sock.c
Fix race for duplicate reqsk on identical SYN
2024-07-05 09:33:48 +02:00
inet_diag.c
inet_diag: Initialize pad field in struct inet_diag_req_v2
2024-07-11 12:49:14 +02:00
inet_fragment.c
inet: inet_defrag: prevent sk release while still in use
2024-04-10 16:35:44 +02:00
inet_hashtables.c
tcp: Fix refcnt handling in __inet_hash_connect().
2024-03-26 18:20:08 -04:00
inet_timewait_sock.c
tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()
2024-03-26 18:20:07 -04:00
inetpeer.c
inetpeer: Fix data-races around sysctl.
2022-07-08 12:10:33 +01:00
ip_forward.c
net: ipv4, ipv6: fix IPSTATS_MIB_OUTOCTETS increment duplicated
2023-08-30 09:44:09 +01:00
ip_fragment.c
inet: inet_defrag: prevent sk release while still in use
2024-04-10 16:35:44 +02:00
ip_gre.c
erspan: make sure erspan_base_hdr is present in skb->head
2024-04-10 16:35:53 +02:00
ip_input.c
ipv4: ignore dst hint for multipath routes
2023-09-01 08:11:51 +01:00
ip_options.c
…
ip_output.c
ipv4: Fix uninit-value access in __ip_make_skb()
2024-05-17 12:02:07 +02:00
ip_sockglue.c
ipmr: fix kernel panic when forwarding mcast packets
2024-02-05 20:14:35 +00:00
ip_tunnel_core.c
tunnels: fix out of bounds access when building IPv6 PMTU error
2024-02-16 19:10:48 +01:00
ip_tunnel.c
net: add netdev_lockdep_set_classes() to virtual drivers
2024-04-13 13:07:30 +02:00
ip_vti.c
ip_vti: fix potential slab-use-after-free in decode_session6
2023-07-11 11:06:08 +02:00
ipcomp.c
xfrm: ipcomp: add extack to ipcomp{4,6}_init_state
2022-09-29 07:18:00 +02:00
ipconfig.c
net: ipconfig: move ic_nameservers_fallback into #ifdef block
2023-05-22 11:17:55 +01:00
ipip.c
ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices
2023-04-12 16:40:39 -07:00
ipmr_base.c
ipmr: adopt rcu_read_lock() in mr_dump()
2022-06-24 11:34:38 +01:00
ipmr.c
ipmr: fix incorrect parameter validation in the ip_mroute_getsockopt() function
2024-03-26 18:19:40 -04:00
Kconfig
tcp: configurable source port perturb table size
2022-11-16 13:02:04 +00:00
Makefile
bpf,fou: Add bpf_skb_{set,get}_fou_encap kfuncs
2023-04-12 16:40:39 -07:00
metrics.c
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
2023-01-23 21:37:25 -08:00
netfilter.c
netfilter: Use l3mdev flow key when re-routing mangled packets
2022-05-16 13:03:29 +02:00
netlink.c
…
nexthop.c
nexthop: Do not increment dump sentinel at the end of the dump
2023-08-15 18:54:53 -07:00
ping.c
bpf: Propagate modified uaddrlen from cgroup sockaddr programs
2024-01-31 16:19:04 -08:00
proc.c
net: fix IPSTATS_MIB_OUTPKGS increment in OutForwDatagrams.
2024-04-03 15:28:39 +02:00
protocol.c
…
raw_diag.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-04-06 12:01:20 -07:00
raw.c
ipv4: Fix uninit-value access in __ip_make_skb()
2024-05-17 12:02:07 +02:00
route.c
net: fix __dst_negative_advice() race
2024-06-16 13:47:44 +02:00
syncookies.c
tcp: fix cookie_init_timestamp() overflows
2023-11-20 11:59:01 +01:00
sysctl_net_ipv4.c
networking: Update to register_net_sysctl_sz
2023-08-15 15:26:18 -07:00
tcp_bbr.c
bpf: Add __bpf_kfunc tag to all kfuncs
2023-02-02 00:25:14 +01:00
tcp_bic.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_bpf.c
tcp_bpf: properly release resources on error paths
2023-10-18 18:09:31 -07:00
tcp_cdg.c
Merge tag 'random-6.1-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random
2022-10-16 15:27:07 -07:00
tcp_cong.c
net: Update an existing TCP congestion control algorithm.
2023-03-22 22:53:00 -07:00
tcp_cubic.c
bpf: Add __bpf_kfunc tag to all kfuncs
2023-02-02 00:25:14 +01:00
tcp_dctcp.c
tcp: Fix shift-out-of-bounds in dctcp_update_alpha().
2024-06-12 11:12:48 +02:00
tcp_dctcp.h
…
tcp_diag.c
tcp: Access &tcp_hashinfo via net.
2022-09-20 10:21:49 -07:00
tcp_fastopen.c
inet: move inet->defer_connect to inet->inet_flags
2023-08-16 11:09:18 +01:00
tcp_highspeed.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_htcp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_hybla.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_illinois.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_input.c
tcp: fix incorrect undo caused by DSACK of TLP retransmit
2024-07-18 13:21:12 +02:00
tcp_ipv4.c
tcp: avoid premature drops in tcp_add_backlog()
2024-06-12 11:11:46 +02:00
tcp_lp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_metrics.c
tcp_metrics: validate source addr length
2024-07-11 12:49:12 +02:00
tcp_minisocks.c
rds: tcp: Fix use-after-free of net in reqsk_timer_handler().
2024-03-26 18:20:08 -04:00
tcp_nv.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_offload.c
net: move gso declarations and functions to their own files
2023-06-10 00:11:41 -07:00
tcp_output.c
tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
2024-05-17 12:02:20 +02:00
tcp_plb.c
prandom: remove prandom_u32_max()
2022-12-20 03:13:45 +01:00
tcp_rate.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2022-04-28 13:02:01 -07:00
tcp_recovery.c
tcp: fix excessive TLP and RACK timeouts from HZ rounding
2023-10-17 17:25:42 -07:00
tcp_scalable.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_timer.c
tcp: fix incorrect undo caused by DSACK of TLP retransmit
2024-07-18 13:21:12 +02:00
tcp_ulp.c
net/ulp: use consistent error code when blocking ULP
2023-01-19 09:26:16 -08:00
tcp_vegas.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_vegas.h
…
tcp_veno.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_westwood.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp_yeah.c
tcp: add accessors to read/set tp->snd_cwnd
2022-04-06 12:05:41 -07:00
tcp.c
tcp: count CLOSE-WAIT sockets for TCP_MIB_CURRESTAB
2024-06-21 14:38:17 +02:00
tunnel4.c
…
udp_bpf.c
bpf, sockmap: Fix an infinite loop error when len is 0 in tcp_bpf_recvmsg_parser()
2023-03-03 17:25:15 +01:00
udp_diag.c
udp: Access &udp_table via net.
2022-11-16 09:43:35 +00:00
udp_impl.h
sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)
2023-06-24 15:50:13 -07:00
udp_offload.c
net: gro: add flush check in udp_gro_receive_segment
2024-05-17 12:02:07 +02:00
udp_tunnel_core.c
udp: lockless UDP_ENCAP_L2TPINUDP / UDP_GRO
2023-11-20 11:58:56 +01:00
udp_tunnel_nic.c
udp_tunnel: Add checks for nla_nest_start() in __udp_tunnel_nic_dump_write()
2022-11-29 08:44:24 -08:00
udp_tunnel_stub.c
…
udp.c
udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
2024-07-18 13:21:14 +02:00
udplite.c
udplite: remove UDPLITE_BIT
2023-11-20 11:58:56 +01:00
xfrm4_input.c
xfrm: Preserve vlan tags for transport mode software GRO
2024-05-17 12:02:20 +02:00
xfrm4_output.c
…
xfrm4_policy.c
Merge tag 'sysctl-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
2023-08-29 17:39:15 -07:00
xfrm4_protocol.c
net: xfrm: unexport __init-annotated xfrm4_protocol_init()
2022-06-08 10:10:13 -07:00
xfrm4_state.c
…
xfrm4_tunnel.c
xfrm: tunnel: add extack to ipip_init_state, xfrm6_tunnel_init_state
2022-09-29 07:18:00 +02:00