Wang Yufen 2486ab434b bpf, sockmap: Fix double uncharge the mem of sk_msg ... 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		2022-03-15 16:43:31 +01:00
..
6lowpan	net: don't include ndisc.h from ipv6.h	2022-02-04 14:15:11 -08:00
9p	virtio,vdpa,qemu_fw_cfg: features, cleanups, fixes	2022-01-18 10:05:48 +02:00
802	net: 802: Use memset_startat() to clear struct fields	2021-11-19 11:23:23 +00:00
8021q	Revert "vlan: move dev_put into vlan_dev_uninit"	2022-02-23 15:21:13 -08:00
appletalk	…
atm	proc: remove PDE_DATA() completely	2022-01-22 08:33:37 +02:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-10 17:29:56 -08:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
bluetooth	Bluetooth: use memset avoid memory leaks	2022-03-04 16:55:38 +01:00
bpf	bpf, test_run: Fix packet size check for live packet mode	2022-03-11 22:01:26 +01:00
bpfilter	…
bridge	net: bridge: Use netif_rx().	2022-03-04 12:02:19 +00:00
caif	net: caif: Use netif_rx().	2022-03-04 12:02:19 +00:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-24 17:54:25 -08:00
ceph	libceph: optionally use bounce buffer on recv path in crc mode	2022-02-02 18:50:36 +01:00
core	bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full	2022-03-15 16:43:31 +01:00
dcb	net: dcb: disable softirqs in dcbnl_flush_dev()	2022-03-03 08:01:55 -08:00
dccp	dccp: remove max48()	2022-01-27 13:53:27 +00:00
decnet	net: decnet: use time_is_before_jiffies() instead of open coding it	2022-02-28 13:21:32 +00:00
dns_resolver	…
dsa	net: dsa: tag_rtl8_4: add rtl8_4t trailing variant	2022-03-05 11:04:25 +00:00
ethernet	gro: remove rcu_read_lock/rcu_read_unlock from gro_complete handlers	2021-11-24 17:21:42 -08:00
ethtool	ethtool: add support to set/get completion queue event size	2022-02-23 20:33:05 -08:00
hsr	flow_dissector: Add support for HSR	2022-03-02 22:44:49 -08:00
ieee802154	net: ipv6: Handle delivery_time in ipv6 defrag	2022-03-03 14:38:48 +00:00
ife	…
ipv4	bpf, sockmap: Fix double uncharge the mem of sk_msg	2022-03-15 16:43:31 +01:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
iucv	s390/iucv: sort out physical vs virtual pointers usage	2022-02-22 16:09:13 -08:00
kcm	net: Don't include filter.h from net/sock.h	2021-12-29 08:48:14 -08:00
key	xfrm: Check if_id in xfrm_migrate	2022-01-26 07:44:01 +01:00
l2tp	l2tp: add netns refcount tracker to l2tp_dfs_seq_data	2021-12-10 06:38:27 -08:00
l3mdev	…
lapb	…
llc	sock: Use sock_owned_by_user_nocheck() instead of sk_lock.owned.	2021-12-10 19:43:00 -08:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
mac802154	…
mctp	mctp: Avoid warning if unregister notifies twice	2022-02-25 22:23:23 -08:00
mpls	net: mpls: Fix GCC 12 warning	2022-02-10 15:29:39 +00:00
mptcp	mptcp: add the mibs for MP_RST	2022-03-04 21:54:30 -08:00
ncsi	all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where appropriate	2022-01-15 08:47:31 -08:00
netfilter	bpf: Replace __diag_ignore with unified __diag_ignore_all	2022-03-05 15:29:36 -08:00
netlabel	lsm: security_task_getsecid_subj() -> security_current_getsecid_subj()	2021-11-22 17:52:47 -05:00
netlink	net: Don't include filter.h from net/sock.h	2021-12-29 08:48:14 -08:00
netrom	netrom: fix api breakage in nr_setsockopt()	2022-01-07 14:11:05 +00:00
nfc	nfc: llcp: Revert "NFC: Keep socket alive until the DISC PDU is actually sent"	2022-03-03 10:43:37 +00:00
nsh	…
openvswitch	net: Add skb_clear_tstamp() to keep the mono delivery_time	2022-03-03 14:38:48 +00:00
packet	net: Handle delivery_time in skb->tstamp during network tapping with af_packet	2022-03-03 14:38:48 +00:00
phonet	phonet/pep: refuse to enable an unbound pipe	2021-12-20 11:49:51 +00:00
psample	…
qrtr	bus: mhi: core: Add an API for auto queueing buffers for DL channel	2021-12-17 17:17:14 +01:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-12-16 16:13:19 -08:00
rfkill	rfkill: allow to get the software rfkill state	2021-12-20 11:02:38 +01:00
rose	net: Don't include filter.h from net/sock.h	2021-12-29 08:48:14 -08:00
rxrpc	rxrpc: Adjust retransmission backoff	2022-01-22 02:03:24 +00:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-01-05 14:36:10 -08:00
smc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
strparser	bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding	2021-11-09 01:05:28 +01:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-10 17:29:56 -08:00
switchdev	net: switchdev: remove lag_mod_cb from switchdev_handle_fdb_event_to_device	2022-02-24 21:31:43 -08:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-02-24 17:54:25 -08:00
tls	tls: cap the output scatter list to something reasonable	2022-02-04 10:14:07 +00:00
unix	Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2022-01-24 15:42:29 -08:00
vmw_vsock	vsock: remove vsock from connected table when connect is interrupted by a signal	2022-02-17 08:56:02 -08:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
x25	net: x25: drop harmless check of !more	2021-12-09 18:35:11 -08:00
xdp	i40e: xsk: Move tmp desc array from driver to pool	2022-01-27 17:25:32 +01:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-03-03 11:55:12 -08:00
Kconfig	page_pool: Add allocation stats	2022-03-03 09:55:28 +00:00
Kconfig.debug	net: add networking namespace refcount tracker	2021-12-10 06:38:26 -08:00
Makefile	…
compat.c	…
devres.c	…
socket.c	net: fix documentation for kernel_getsockname	2022-02-14 14:01:19 +00:00
sysctl_net.c	sections: move and rename core_kernel_data() to is_kernel_core_data()	2021-11-09 10:02:50 -08:00