Eric Dumazet
32e9a9ee28
tcp: deny tcp_disconnect() when threads are waiting
[ Upstream commit 4faeee0cf8a5d88d63cdbc3bab124fb0e6aed08c ]
Historically connect(AF_UNSPEC) has been abused by syzkaller
and other fuzzers to trigger various bugs.
A recent one triggers a divide-by-zero [1], and Paolo Abeni
was able to diagnose the issue.
tcp_recvmsg_locked() has tests about sk_state being not TCP_LISTEN
and TCP REPAIR mode being not used.
Then later if socket lock is released in sk_wait_data(),
another thread can call connect(AF_UNSPEC), then make this
socket a TCP listener.
When recvmsg() is resumed, it can eventually call tcp_cleanup_rbuf()
and attempt a divide by 0 in tcp_rcv_space_adjust() [1]
This patch adds a new socket field, counting number of threads
blocked in sk_wait_event() and inet_wait_for_connect().
If this counter is not zero, tcp_disconnect() returns an error.
This patch adds code in blocking socket system calls, thus should
not hurt performance of non blocking ones.
Note that we probably could revert commit 499350a5a6 ("tcp:
initialize rcv_mss to TCP_MIN_MSS instead of 0") to restore
original tcpi_rcv_mss meaning (was 0 if no payload was ever
received on a socket)
[1]
divide error: 0000 [#1] PREEMPT SMP KASAN
CPU: 0 PID: 13832 Comm: syz-executor.5 Not tainted 6.3.0-rc4-syzkaller-00224-g00c7b5f4ddc5 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023
RIP: 0010:tcp_rcv_space_adjust+0x36e/0x9d0 net/ipv4/tcp_input.c:740
Code: 00 00 00 00 fc ff df 4c 89 64 24 48 8b 44 24 04 44 89 f9 41 81 c7 80 03 00 00 c1 e1 04 44 29 f0 48 63 c9 48 01 e9 48 0f af c1 <49> f7 f6 48 8d 04 41 48 89 44 24 40 48 8b 44 24 30 48 c1 e8 03 48
RSP: 0018:ffffc900033af660 EFLAGS: 00010206
RAX: 4a66b76cbade2c48 RBX: ffff888076640cc0 RCX: 00000000c334e4ac
RDX: 0000000000000000 RSI: dffffc0000000000 RDI: 0000000000000001
RBP: 00000000c324e86c R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: ffff8880766417f8
R13: ffff888028fbb980 R14: 0000000000000000 R15: 0000000000010344
FS: 00007f5bffbfe700(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000001b32f25000 CR3: 000000007ced0000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
tcp_recvmsg_locked+0x100e/0x22e0 net/ipv4/tcp.c:2616
tcp_recvmsg+0x117/0x620 net/ipv4/tcp.c:2681
inet6_recvmsg+0x114/0x640 net/ipv6/af_inet6.c:670
sock_recvmsg_nosec net/socket.c:1017 [inline]
sock_recvmsg+0xe2/0x160 net/socket.c:1038
____sys_recvmsg+0x210/0x5a0 net/socket.c:2720
___sys_recvmsg+0xf2/0x180 net/socket.c:2762
do_recvmmsg+0x25e/0x6e0 net/socket.c:2856
__sys_recvmmsg net/socket.c:2935 [inline]
__do_sys_recvmmsg net/socket.c:2958 [inline]
__se_sys_recvmmsg net/socket.c:2951 [inline]
__x64_sys_recvmmsg+0x20f/0x260 net/socket.c:2951
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7f5c0108c0f9
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f5bffbfe168 EFLAGS: 00000246 ORIG_RAX: 000000000000012b
RAX: ffffffffffffffda RBX: 00007f5c011ac050 RCX: 00007f5c0108c0f9
RDX: 0000000000000001 RSI: 0000000020000bc0 RDI: 0000000000000003
RBP: 00007f5c010e7b39 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000122 R11: 0000000000000246 R12: 0000000000000000
R13: 00007f5c012cfb1f R14: 00007f5bffbfe300 R15: 0000000000022000
</TASK>
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Reported-by: syzbot <syzkaller@googlegroups.com>
Reported-by: Paolo Abeni <pabeni@redhat.com>
Diagnosed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20230526163458.2880232-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
2023-06-09 10:28:53 +02:00 |
| .. |
|
9p
|
|
|
|
bluetooth
|
Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
|
2022-08-03 11:59:37 +02:00 |
|
caif
|
net: caif: add proper error handling
|
2021-06-10 13:37:09 +02:00 |
|
iucv
|
|
|
|
netfilter
|
netfilter: nf_tables: allow up to 64 bytes in the set element data area
|
2023-05-30 12:44:08 +01:00 |
|
netns
|
ipv4: convert fib_num_tclassid_users to atomic_t
|
2021-12-08 09:01:12 +01:00 |
|
nfc
|
NFC: add NCI_UNREG flag to eliminate the race
|
2021-12-01 09:23:35 +01:00 |
|
phonet
|
|
|
|
sctp
|
sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop
|
2023-03-11 16:44:11 +01:00 |
|
tc_act
|
net/sched: act_pedit: really ensure the skb is writable
|
2022-05-18 09:47:25 +02:00 |
|
6lowpan.h
|
|
|
|
act_api.h
|
|
|
|
addrconf.h
|
ipv6/addrconf: fix a null-ptr-deref bug for ip6_ptr
|
2022-08-03 11:59:39 +02:00 |
|
af_ieee802154.h
|
|
|
|
af_rxrpc.h
|
|
|
|
af_unix.h
|
|
|
|
af_vsock.h
|
|
|
|
ah.h
|
|
|
|
arp.h
|
ipv4: Invalidate neighbour for broadcast address upon address addition
|
2022-04-15 14:18:33 +02:00 |
|
atmclip.h
|
|
|
|
ax25.h
|
ax25: fix reference count leaks of ax25_dev
|
2022-04-20 09:19:39 +02:00 |
|
ax88796.h
|
|
|
|
bond_3ad.h
|
bonding: fix data-races around agg_select_timer
|
2022-02-23 11:59:58 +01:00 |
|
bond_alb.h
|
bonding: make tx_rebalance_counter an atomic
|
2021-12-14 14:49:00 +01:00 |
|
bond_options.h
|
|
|
|
bonding.h
|
net: fix stack overflow when LRO is disabled for virtual interfaces
|
2023-05-30 12:44:09 +01:00 |
|
bpf_sk_storage.h
|
|
|
|
busy_poll.h
|
net: Fix a data-race around sysctl_net_busy_poll.
|
2022-09-05 10:27:42 +02:00 |
|
calipso.h
|
|
|
|
cfg80211-wext.h
|
|
|
|
cfg80211.h
|
mac80211: properly handle A-MSDUs that start with an RFC 1042 header
|
2021-06-03 08:59:01 +02:00 |
|
cfg802154.h
|
|
|
|
checksum.h
|
net: Force inlining of checksum functions in net/checksum.h
|
2022-03-02 11:41:08 +01:00 |
|
cipso_ipv4.h
|
|
|
|
cls_cgroup.h
|
|
|
|
codel.h
|
|
|
|
codel_impl.h
|
|
|
|
codel_qdisc.h
|
|
|
|
compat.h
|
|
|
|
datalink.h
|
|
|
|
dcbevent.h
|
|
|
|
dcbnl.h
|
|
|
|
devlink.h
|
|
|
|
dn.h
|
|
|
|
dn_dev.h
|
|
|
|
dn_fib.h
|
|
|
|
dn_neigh.h
|
|
|
|
dn_nsp.h
|
|
|
|
dn_route.h
|
|
|
|
drop_monitor.h
|
|
|
|
dsa.h
|
|
|
|
dsfield.h
|
|
|
|
dst.h
|
net: add atomic_long_t to net_device_stats fields
|
2023-01-18 11:41:37 +01:00 |
|
dst_cache.h
|
|
|
|
dst_metadata.h
|
net: fix a memleak when uncloning an skb dst and its metadata
|
2022-02-16 12:52:51 +01:00 |
|
dst_ops.h
|
|
|
|
erspan.h
|
|
|
|
esp.h
|
esp: limit skb_page_frag_refill use to a single page
|
2022-07-12 16:30:45 +02:00 |
|
ethoc.h
|
|
|
|
failover.h
|
|
|
|
fib_notifier.h
|
|
|
|
fib_rules.h
|
ipv6: fix memory leak in fib6_rule_suppress
|
2021-12-08 09:01:13 +01:00 |
|
firewire.h
|
|
|
|
flow.h
|
|
|
|
flow_dissector.h
|
net/sched: flower: fix parsing of ethertype following VLAN header
|
2022-04-20 09:19:34 +02:00 |
|
flow_offload.h
|
|
|
|
fou.h
|
|
|
|
fq.h
|
|
|
|
fq_impl.h
|
|
|
|
garp.h
|
|
|
|
gen_stats.h
|
|
|
|
genetlink.h
|
|
|
|
geneve.h
|
|
|
|
gre.h
|
|
|
|
gro_cells.h
|
|
|
|
gtp.h
|
|
|
|
gue.h
|
|
|
|
hwbm.h
|
|
|
|
icmp.h
|
|
|
|
ieee80211_radiotap.h
|
|
|
|
ieee802154_netdev.h
|
net: ieee802154: return -EINVAL for unknown addr type
|
2022-10-26 13:22:59 +02:00 |
|
if_inet6.h
|
ipv6: fix locking issues with loops over idev->addr_list
|
2022-06-14 18:11:25 +02:00 |
|
ife.h
|
|
|
|
ila.h
|
|
|
|
inet6_connection_sock.h
|
|
|
|
inet6_hashtables.h
|
|
|
|
inet_common.h
|
|
|
|
inet_connection_sock.h
|
|
|
|
inet_ecn.h
|
|
|
|
inet_frag.h
|
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
|
2022-01-27 09:19:54 +01:00 |
|
inet_hashtables.h
|
secure_seq: use the 64 bits of the siphash for port offset calculation
|
2022-06-06 08:33:49 +02:00 |
|
inet_sock.h
|
tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept.
|
2022-07-29 17:14:11 +02:00 |
|
inet_timewait_sock.h
|
|
|
|
inetpeer.h
|
|
|
|
ip.h
|
ipv{4,6}/raw: fix output xfrm lookup wrt protocol
|
2023-06-05 08:17:33 +02:00 |
|
ip6_checksum.h
|
|
|
|
ip6_fib.h
|
ipv6: annotate accesses to fn->fn_sernum
|
2022-02-01 17:24:38 +01:00 |
|
ip6_route.h
|
net: ipv6: fix returned variable type in ip6_skb_dst_mtu
|
2021-08-12 13:20:57 +02:00 |
|
ip6_tunnel.h
|
ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode
|
2023-05-30 12:44:05 +01:00 |
|
ip_fib.h
|
ipv4: convert fib_num_tclassid_users to atomic_t
|
2021-12-08 09:01:12 +01:00 |
|
ip_tunnels.h
|
ip_gre, ip6_gre: Fix race condition on o_seqno in collect_md mode
|
2023-05-30 12:44:05 +01:00 |
|
ip_vs.h
|
|
|
|
ipcomp.h
|
|
|
|
ipconfig.h
|
|
|
|
ipv6.h
|
tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
|
2023-04-26 11:24:05 +02:00 |
|
ipv6_frag.h
|
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
|
2022-01-27 09:19:54 +01:00 |
|
ipv6_stubs.h
|
net: ipv6: add fib6_nh_release_dsts stub
|
2021-12-01 09:23:33 +01:00 |
|
ipx.h
|
|
|
|
iw_handler.h
|
|
|
|
kcm.h
|
|
|
|
l3mdev.h
|
|
|
|
lag.h
|
|
|
|
lapb.h
|
|
|
|
lib80211.h
|
|
|
|
llc.h
|
llc: fix out-of-bound array index in llc_sk_dev_hash()
|
2021-11-17 09:48:47 +01:00 |
|
llc_c_ac.h
|
|
|
|
llc_c_ev.h
|
|
|
|
llc_c_st.h
|
|
|
|
llc_conn.h
|
|
|
|
llc_if.h
|
|
|
|
llc_pdu.h
|
net: llc: fix skb_over_panic
|
2021-08-04 12:27:39 +02:00 |
|
llc_s_ac.h
|
|
|
|
llc_s_ev.h
|
|
|
|
llc_s_st.h
|
|
|
|
llc_sap.h
|
|
|
|
lwtunnel.h
|
|
|
|
mac80211.h
|
|
|
|
mac802154.h
|
|
|
|
mip6.h
|
|
|
|
mld.h
|
|
|
|
mpls.h
|
|
|
|
mpls_iptunnel.h
|
|
|
|
mrp.h
|
mrp: introduce active flags to prevent UAF when applicant uninit
|
2023-01-18 11:41:37 +01:00 |
|
ncsi.h
|
|
|
|
ndisc.h
|
|
|
|
neighbour.h
|
net, neigh: Enable state migration between NUD_PERMANENT and NTF_USE
|
2021-11-17 09:48:49 +01:00 |
|
net_failover.h
|
|
|
|
net_namespace.h
|
net: make get_net_ns return error if NET_NS is disabled
|
2021-06-23 14:41:25 +02:00 |
|
net_ratelimit.h
|
|
|
|
netevent.h
|
|
|
|
netlabel.h
|
|
|
|
netlink.h
|
|
|
|
netprio_cgroup.h
|
|
|
|
netrom.h
|
|
|
|
nexthop.h
|
net: ipv4: Fix rtnexthop len when RTA_FLOW is present
|
2021-10-06 15:42:33 +02:00 |
|
nl802154.h
|
net: ieee802154: handle iftypes as u32
|
2021-12-01 09:23:32 +01:00 |
|
nsh.h
|
|
|
|
p8022.h
|
|
|
|
page_pool.h
|
|
|
|
ping.h
|
|
|
|
pkt_cls.h
|
|
|
|
pkt_sched.h
|
net: prevent user from passing illegal stab size
|
2021-10-17 10:42:34 +02:00 |
|
pptp.h
|
|
|
|
protocol.h
|
tcp/udp: Make early_demux back namespacified.
|
2022-11-10 17:57:55 +01:00 |
|
psample.h
|
psample: Add a fwd declaration for skbuff
|
2021-08-18 08:56:59 +02:00 |
|
psnap.h
|
|
|
|
raw.h
|
raw: Fix a data-race around sysctl_raw_l3mdev_accept.
|
2022-07-21 20:59:22 +02:00 |
|
rawv6.h
|
|
|
|
red.h
|
|
|
|
regulatory.h
|
|
|
|
request_sock.h
|
|
|
|
rose.h
|
|
|
|
route.h
|
ipv4: remove sparse error in ip_neigh_gw4()
|
2022-02-01 17:24:39 +01:00 |
|
rsi_91x.h
|
|
|
|
rtnetlink.h
|
|
|
|
rtnh.h
|
|
|
|
sch_generic.h
|
net/sched: sch_taprio: fix possible use-after-free
|
2023-02-06 07:52:37 +01:00 |
|
scm.h
|
scm: fix MSG_CTRUNC setting condition for SO_PASSSEC
|
2023-05-17 11:35:41 +02:00 |
|
secure_seq.h
|
secure_seq: use the 64 bits of the siphash for port offset calculation
|
2022-06-06 08:33:49 +02:00 |
|
seg6.h
|
|
|
|
seg6_hmac.h
|
|
|
|
seg6_local.h
|
|
|
|
slhc_vj.h
|
|
|
|
smc.h
|
|
|
|
snmp.h
|
|
|
|
sock.h
|
tcp: deny tcp_disconnect() when threads are waiting
|
2023-06-09 10:28:53 +02:00 |
|
sock_reuseport.h
|
|
|
|
Space.h
|
|
|
|
stp.h
|
|
|
|
strparser.h
|
bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding
|
2021-11-17 09:48:48 +01:00 |
|
switchdev.h
|
|
|
|
tcp.h
|
tcp/udp: Make early_demux back namespacified.
|
2022-11-10 17:57:55 +01:00 |
|
tcp_states.h
|
|
|
|
timewait_sock.h
|
|
|
|
tipc.h
|
|
|
|
tls.h
|
net/tls: Fix flipped sign in tls_err_abort() calls
|
2021-11-02 19:46:12 +01:00 |
|
transp_v6.h
|
|
|
|
tso.h
|
|
|
|
tun_proto.h
|
|
|
|
udp.h
|
tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
|
2023-04-26 11:24:05 +02:00 |
|
udp_tunnel.h
|
udp: call udp_encap_enable for v6 sockets when enabling encap
|
2022-04-15 14:18:01 +02:00 |
|
udplite.h
|
tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
|
2023-04-26 11:24:05 +02:00 |
|
vsock_addr.h
|
|
|
|
vxlan.h
|
|
|
|
wext.h
|
|
|
|
wimax.h
|
|
|
|
x25.h
|
|
|
|
x25device.h
|
|
|
|
xdp.h
|
|
|
|
xdp_priv.h
|
|
|
|
xdp_sock.h
|
|
|
|
xfrm.h
|
xfrm: Check if_id in xfrm_migrate
|
2022-03-19 13:40:16 +01:00 |