iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8786bde11a4f31b63b3036731df0b47337a7a245
linux/net/ipv4
History
Pengcheng Yang 8786bde11a bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data 
[ Upstream commit 7a9841ca02 ]

In tcp_bpf_send_verdict() redirection, the eval variable is assigned to
__SK_REDIRECT after the apply_bytes data is sent, if msg has more_data,
sock_put() will be called multiple times.

We should reset the eval variable to __SK_NONE every time more_data
starts.

This causes:

IPv4: Attempt to release TCP socket in state 1 00000000b4c925d7
------------[ cut here ]------------
refcount_t: addition on 0; use-after-free.
WARNING: CPU: 5 PID: 4482 at lib/refcount.c:25 refcount_warn_saturate+0x7d/0x110
Modules linked in:
CPU: 5 PID: 4482 Comm: sockhash_bypass Kdump: loaded Not tainted 6.0.0 #1
Hardware name: Red Hat KVM, BIOS 1.11.0-2.el7 04/01/2014
Call Trace:
 <TASK>
 __tcp_transmit_skb+0xa1b/0xb90
 ? __alloc_skb+0x8c/0x1a0
 ? __kmalloc_node_track_caller+0x184/0x320
 tcp_write_xmit+0x22a/0x1110
 __tcp_push_pending_frames+0x32/0xf0
 do_tcp_sendpages+0x62d/0x640
 tcp_bpf_push+0xae/0x2c0
 tcp_bpf_sendmsg_redir+0x260/0x410
 ? preempt_count_add+0x70/0xa0
 tcp_bpf_send_verdict+0x386/0x4b0
 tcp_bpf_sendmsg+0x21b/0x3b0
 sock_sendmsg+0x58/0x70
 __sys_sendto+0xfa/0x170
 ? xfd_validate_state+0x1d/0x80
 ? switch_fpu_return+0x59/0xe0
 __x64_sys_sendto+0x24/0x30
 do_syscall_64+0x37/0x90
 entry_SYSCALL_64_after_hwframe+0x63/0xcd

Fixes: cd9733f5d7 ("tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict function")
Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/1669718441-2654-2-git-send-email-yangpc@wangsu.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-12-31 13:14:14 +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: conntrack: Fix data-races around ct mark
2022-12-02 17:41:04 +01:00
af_inet.c
tcp/udp: Make early_demux back namespacified.
2022-11-10 18:15:38 +01:00
ah4.c
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
arp.c
ipv4: Invalidate neighbour for broadcast address upon address addition
2022-04-13 20:59:05 +02:00
bpf_tcp_ca.c
bpf: Forbid bpf_ktime_get_coarse_ns and bpf_timer_* in tracing progs
2021-11-25 09:49:07 +01:00
cipso_ipv4.c
cipso: Fix data-races around sysctl.
2022-07-21 21:24:21 +02:00
datagram.c
udp: Update reuse->has_conns under reuseport_lock.
2022-10-29 10:12:56 +02:00
devinet.c
net: Fix data-races around sysctl_devconf_inherit_init_net.
2022-08-31 17:16:44 +02:00
esp4_offload.c
xfrm: replay: Fix ESN wrap around for GSO
2022-12-02 17:41:02 +01:00
esp4.c
esp: limit skb_page_frag_refill use to a single page
2022-04-27 14:38:52 +02:00
fib_frontend.c
ipv4: Fix incorrect route flushing when table ID 0 is used
2022-12-14 11:37:28 +01:00
fib_lookup.h
ipv4: fix data races in fib_alias_hw_flags_set
2022-02-23 12:03:10 +01:00
fib_notifier.c
…
fib_rules.c
ipv4: convert fib_num_tclassid_users to atomic_t
2021-12-08 09:04:49 +01:00
fib_semantics.c
ipv4: Fix incorrect route flushing when source address is deleted
2022-12-14 11:37:28 +01:00
fib_trie.c
ipv4: Fix error return code in fib_table_insert()
2022-12-02 17:41:07 +01:00
fou.c
fou: remove sparse errors
2021-08-31 12:03:33 +01:00
gre_demux.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
gre_offload.c
ip_gre: add csum offload support for gre header
2021-01-29 20:39:14 -08:00
icmp.c
ip: Fix data-races around sysctl_ip_no_pmtu_disc.
2022-07-29 17:25:13 +02:00
igmp.c
igmp: Fix data-races around sysctl_igmp_qrv.
2022-08-03 12:03:48 +02:00
inet_connection_sock.c
inet: add READ_ONCE(sk->sk_bound_dev_if) in inet_csk_bind_conflict()
2022-12-31 13:14:11 +01:00
inet_diag.c
inet_diag: fix kernel-infoleak for UDP sockets
2021-12-22 09:32:40 +01:00
inet_fragment.c
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 11:05:35 +01:00
inet_hashtables.c
tcp: configurable source port perturb table size
2022-12-02 17:41:11 +01:00
inet_timewait_sock.c
net: Use generic ns_common::count
2020-08-19 14:06:36 +02:00
inetpeer.c
inetpeer: Fix data-races around sysctl.
2022-07-21 21:24:21 +02:00
ip_forward.c
ip: Fix data-races around sysctl_ip_fwd_update_priority.
2022-07-29 17:25:13 +02:00
ip_fragment.c
inet: frags: annotate races around fqdir->dead and fqdir->high_thresh
2022-01-27 11:05:35 +01:00
ip_gre.c
ip_gre: do not report erspan version on GRE interface
2022-12-14 11:37:27 +01:00
ip_input.c
xfrm: fix "disable_policy" on ipv4 early demux
2022-12-02 17:41:02 +01:00
ip_options.c
net: clean up codestyle for net/ipv4
2020-08-25 06:28:02 -07:00
ip_output.c
net: Find dst with sk's xfrm policy not ctl_sk
2022-09-23 14:15:51 +02:00
ip_sockglue.c
net: Fix data-races around sysctl_optmem_max.
2022-08-31 17:16:43 +02:00
ip_tunnel_core.c
tunnels: do not assume mac header is set in skb_tunnel_check_pmtu()
2022-07-07 17:53:29 +02:00
ip_tunnel.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
ip_vti.c
ip_tunnel: use ndo_siocdevprivate
2021-07-27 20:11:44 +01:00
ipcomp.c
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
ipconfig.c
net: ipconfig: Don't override command-line hostnames or domains
2021-06-02 13:27:03 -07:00
ipip.c
ip_tunnel: use ndo_siocdevprivate
2021-07-27 20:11:44 +01:00
ipmr_base.c
…
ipmr.c
ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path
2022-02-16 12:56:29 +01:00
Kconfig
tcp: configurable source port perturb table size
2022-12-02 17:41:11 +01:00
Makefile
bpf: Clean up sockmap related Kconfigs
2021-02-26 12:28:03 -08:00
metrics.c
treewide: rename nla_strlcpy to nla_strscpy.
2020-11-16 08:08:54 -08:00
netfilter.c
netfilter: Dissect flow after packet mangling
2021-04-18 22:04:16 +02:00
netlink.c
…
nexthop.c
nh: fix scope used to find saddr when adding non gw nh
2022-11-03 23:59:19 +09:00
ping.c
ping: fix address binding wrt vrf
2022-05-18 10:26:57 +02:00
proc.c
ip: Fix data-races around sysctl_ip_default_ttl.
2022-07-29 17:25:09 +02:00
protocol.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
raw_diag.c
net: Use nlmsg_unicast() instead of netlink_unicast()
2021-07-13 09:28:29 -07:00
raw.c
ipv4: raw: lock the socket in raw_bind()
2022-02-01 17:27:14 +01:00
route.c
ipv4: Fix data-races around sysctl_fib_multipath_hash_fields.
2022-07-29 17:25:21 +02:00
syncookies.c
tcp: Fix data-races around sysctl knobs related to SYN option.
2022-07-29 17:25:22 +02:00
sysctl_net_ipv4.c
tcp/udp: Make early_demux back namespacified.
2022-11-10 18:15:38 +01:00
tcp_bbr.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_bic.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_bpf.c
bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
2022-12-31 13:14:14 +01:00
tcp_cdg.c
tcp: cdg: allow tcp_cdg_release() to be called multiple times
2022-11-26 09:24:50 +01:00
tcp_cong.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_cubic.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_dctcp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_dctcp.h
…
tcp_diag.c
…
tcp_fastopen.c
tcp: Fix data-races around sysctl_tcp_fastopen_blackhole_timeout.
2022-07-29 17:25:19 +02:00
tcp_highspeed.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_htcp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_hybla.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_illinois.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_input.c
tcp: fix indefinite deferral of RTO with SACK reneging
2022-11-03 23:59:17 +09:00
tcp_ipv4.c
dccp/tcp: Reset saddr on failure after inet6?_hash_connect().
2022-12-02 17:41:07 +01:00
tcp_lp.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_metrics.c
tcp: Fix data-races around sysctl_tcp_no_ssthresh_metrics_save.
2022-08-03 12:03:45 +02:00
tcp_minisocks.c
tcp: Fix a data-race around sysctl_tcp_abort_on_overflow.
2022-07-29 17:25:23 +02:00
tcp_nv.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_offload.c
net, gro: Set inner transport header offset in tcp/udp GRO hook
2021-08-02 10:20:56 +01:00
tcp_output.c
tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited
2022-10-26 12:34:48 +02:00
tcp_rate.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_recovery.c
tcp: Fix data-races around sysctl_tcp_recovery.
2022-07-29 17:25:22 +02:00
tcp_scalable.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_timer.c
tcp: Fix a data-race around sysctl_tcp_thin_linear_timeouts.
2022-07-29 17:25:22 +02:00
tcp_ulp.c
…
tcp_vegas.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_vegas.h
…
tcp_veno.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_westwood.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp_yeah.c
tcp: add accessors to read/set tp->snd_cwnd
2022-06-14 18:36:11 +02:00
tcp.c
tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent
2022-11-16 09:58:18 +01:00
tunnel4.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -07:00
udp_bpf.c
net: Implement ->sock_is_readable() for UDP and AF_UNIX
2021-10-26 12:29:33 -07:00
udp_diag.c
net: Use nlmsg_unicast() instead of netlink_unicast()
2021-07-13 09:28:29 -07:00
udp_impl.h
…
udp_offload.c
fou: remove sparse errors
2021-08-31 12:03:33 +01:00
udp_tunnel_core.c
rxrpc: Fix ICMP/ICMP6 error handling
2022-09-15 11:30:05 +02:00
udp_tunnel_nic.c
udp_tunnel: Fix end of loop test in udp_tunnel_nic_unregister()
2022-03-02 11:47:59 +01:00
udp_tunnel_stub.c
…
udp.c
udp: Update reuse->has_conns under reuseport_lock.
2022-10-29 10:12:56 +02:00
udplite.c
net: Remove the member netns_ok
2021-05-17 15:29:35 -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:36:18 +02:00
xfrm4_state.c
…
xfrm4_tunnel.c
xfrm: remove description from xfrm_type struct
2021-06-09 09:38:52 +02:00