Wang Yufen cd84ea3920 bpf, sockmap: Fix double uncharge the mem of sk_msg ... [ Upstream commit 2486ab434b ] If tcp_bpf_sendmsg is running during a tear down operation, psock may be freed. tcp_bpf_sendmsg() tcp_bpf_send_verdict() sk_msg_return() tcp_bpf_sendmsg_redir() unlikely(!psock)) sk_msg_free() The mem of msg has been uncharged in tcp_bpf_send_verdict() by sk_msg_return(), and would be uncharged by sk_msg_free() again. When psock is null, we can simply returning an error code, this would then trigger the sk_msg_free_nocharge in the error path of __SK_REDIRECT and would have the side effect of throwing an error up to user space. This would be a slight change in behavior from user side but would look the same as an error if the redirect on the socket threw an error. This issue can cause the following info: WARNING: CPU: 0 PID: 2136 at net/ipv4/af_inet.c:155 inet_sock_destruct+0x13c/0x260 Call Trace: <TASK> __sk_destruct+0x24/0x1f0 sk_psock_destroy+0x19b/0x1c0 process_one_work+0x1b3/0x3c0 worker_thread+0x30/0x350 ? process_one_work+0x3c0/0x3c0 kthread+0xe6/0x110 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork+0x22/0x30 </TASK> Fixes: 604326b41a ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: Wang Yufen <wangyufen@huawei.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: John Fastabend <john.fastabend@gmail.com> Link: https://lore.kernel.org/bpf/20220304081145.2037182-5-wangyufen@huawei.com Signed-off-by: Sasha Levin <sashal@kernel.org>		2022-04-08 14:40:21 +02: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: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check()	2022-01-27 10:54:00 +01:00
af_inet.c	gso: do not skip outer ip header in case of ipip and net_failover	2022-03-02 11:42:49 +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	net: Exempt multicast addresses from five-second neighbor lifetime	2020-11-13 14:24:39 -08: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	net: ipv4: fix memory leak in netlbl_cipsov4_add_std	2021-06-23 14:42:41 +02:00
datagram.c	inet: stop leaking jiffies on the wire	2019-11-01 14:57:52 -07:00
devinet.c	net: return correct error code	2021-12-08 09:03:18 +01:00
esp4_offload.c	esp: Fix BEET mode inter address family tunneling on GSO	2022-03-16 14:15:57 +01:00
esp4.c	esp: Fix possible buffer overflow in ESP transformation	2022-03-23 09:13:29 +01:00
fib_frontend.c	ipv4: convert fib_num_tclassid_users to atomic_t	2021-12-08 09:03:26 +01:00
fib_lookup.h	net: add net available in build_state	2020-03-29 22:30:57 -07:00
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: avoid quadratic behavior in netns dismantle	2022-01-27 10:54:31 +01:00
fib_trie.c	ipv4: Silence suspicious RCU usage warning	2020-08-26 15:58:48 -07: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	icmp: don't send out ICMP messages with a source address of 0.0.0.0	2021-06-23 14:42:47 +02:00
igmp.c	igmp: Add ip_mc_list lock in ip_check_mc_rcu	2021-09-12 08:58:26 +02:00
inet_connection_sock.c	tcp: switch orphan_count to bare per-cpu counters	2021-11-18 14:04:08 +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	tcp: switch orphan_count to bare per-cpu counters	2021-11-18 14:04:08 +01:00
inet_timewait_sock.c
inetpeer.c	inetpeer: fix data-race in inet_putpeer / inet_putpeer	2019-11-07 16:15:56 -08:00
ip_forward.c
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	gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst()	2022-01-27 10:54:33 +01:00
ip_input.c	bpf: Add socket assign support	2020-03-30 13:45:04 -07:00
ip_options.c	net: clean up codestyle for net/ipv4	2020-08-25 06:28:02 -07:00
ip_output.c	ipv4: tcp: send zero IPID in SYNACK messages	2022-02-01 17:25:47 +01:00
ip_sockglue.c	net: Remove duplicated midx check against 0	2020-08-25 06:23:59 -07:00
ip_tunnel_core.c	tunnels: Fix off-by-one in lower MTU bounds for ICMP/ICMPv6 replies	2020-11-09 15:39:39 -08:00
ip_tunnel.c	net: Set true network header for ECN decapsulation	2021-08-04 12:46:42 +02: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	net: ipv4: remove duplicate "the the" phrase in Kconfig text	2020-08-18 16:02:16 -07:00
Makefile	udp_tunnel: add central NIC RX port offload infrastructure	2020-07-10 13:54:00 -07:00
metrics.c
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	net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group	2021-12-01 09:19:05 +01:00
ping.c	ping: remove pr_err from ping_lookup	2022-03-02 11:42:48 +01: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-12 22:34:48 -07:00
raw.c	ipv4: raw: lock the socket in raw_bind()	2022-02-01 17:25:47 +01:00
route.c	ipv4: fix endianness issue in inet_rtm_getroute_build_skb()	2021-09-15 09:50:46 +02:00
syncookies.c	net: Update window_clamp if SOCK_RCVBUF is set	2020-11-10 17:42:35 -08:00
sysctl_net_ipv4.c	net: Make tcp_allowed_congestion_control readonly in non-init netns	2021-04-21 13:00:57 +02: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: fix stretch ACK bugs in BIC	2020-03-16 18:26:54 -07:00
tcp_bpf.c	bpf, sockmap: Fix double uncharge the mem of sk_msg	2022-04-08 14:40:21 +02:00
tcp_cdg.c
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	inet_diag: Move the INET_DIAG_REQ_BYTECODE nlattr to cb->data	2020-02-27 18:50:19 -08:00
tcp_fastopen.c	tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD	2021-09-18 13:40:29 +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: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()	2022-02-05 12:37:57 +01:00
tcp_ipv4.c	tcp: md5: Fix overlap between vrf and non-vrf keys	2021-10-27 09:56:48 +02:00
tcp_lp.c
tcp_metrics.c	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -07:00
tcp_minisocks.c	tcp: relookup sock for RST+ACK packets handled by obsolete req sock	2021-03-30 14:31:59 +02: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	ipv6: tcp: drop silly ICMPv6 packet too big messages	2021-07-25 14:36:21 +02:00
tcp_rate.c
tcp_recovery.c	tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN	2021-02-03 23:28:52 +01:00
tcp_scalable.c	net: ipv4: delete repeated words	2020-08-24 17:31:20 -07:00
tcp_timer.c	tcp: make TCP_USER_TIMEOUT accurate for zero window probes	2021-02-03 23:28:51 +01:00
tcp_ulp.c	bpf: sockmap: Only check ULP for TCP sockets	2020-03-09 22:34:58 +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: fix stretch ACK bugs in Yeah	2020-03-16 18:26:55 -07:00
tcp.c	tcp: make tcp_read_sock() more robust	2022-03-19 13:44:46 +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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-12 22:34:48 -07:00
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	udp_tunnel: add central NIC RX port offload infrastructure	2020-07-10 13:54:00 -07: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: call udp_encap_enable for v6 sockets when enabling encap	2022-04-08 14:39:54 +02:00
udplite.c	net/ipv4: remove compat_ip_{get,set}sockopt	2020-07-19 18:16:41 -07:00
xfrm4_input.c	xfrm: state: remove extract_input indirection from xfrm_state_afinfo	2020-05-06 09:40:08 +02:00
xfrm4_output.c	xfrm: fix unused variable warning if CONFIG_NETFILTER=n	2020-05-11 15:12:27 +02:00
xfrm4_policy.c	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2019-12-24 22:28:54 -08:00
xfrm4_protocol.c	xfrm: add route lookup to xfrm4_rcv_encap	2019-12-09 09:59:07 +01:00
xfrm4_state.c	xfrm: remove output_finish indirection from xfrm_state_afinfo	2020-05-06 09:40:08 +02:00
xfrm4_tunnel.c	xfrm: interface: fix the priorities for ipip and ipv6 tunnels	2020-10-09 12:29:48 +02:00