Jakub Kicinski 72fa0f65b5 sock: redo the psock vs ULP protection check ... [ Upstream commit e34a07c0ae ] Commit 8a59f9d1e3 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()") has moved the inet_csk_has_ulp(sk) check from sk_psock_init() to the new tcp_bpf_update_proto() function. I'm guessing that this was done to allow creating psocks for non-inet sockets. Unfortunately the destruction path for psock includes the ULP unwind, so we need to fail the sk_psock_init() itself. Otherwise if ULP is already present we'll notice that later, and call tcp_update_ulp() with the sk_proto of the ULP itself, which will most likely result in the ULP looping its callbacks. Fixes: 8a59f9d1e3 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()") Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: John Fastabend <john.fastabend@gmail.com> Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> Tested-by: Jakub Sitnicki <jakub@cloudflare.com> Link: https://lore.kernel.org/r/20220620191353.1184629-2-kuba@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>		2022-06-29 09:03:25 +02:00
..
Makefile	of: net: move of_net under net/	2022-03-08 19:12:41 +01:00
bpf_sk_storage.c	bpf: Introduce MEM_RDONLY flag	2022-05-01 17:22:24 +02:00
datagram.c	udp: fix skb_copy_and_csum_datagram with odd segment sizes	2021-02-04 18:56:56 -08:00
datagram.h	net/core: Allow the compiler to verify declaration and definition consistency	2019-03-27 13:49:44 -07:00
dev.c	net: fix data-race in dev_isalive()	2022-06-29 09:03:22 +02:00
dev_addr_lists.c	net: dev_addr_list: handle first address in __hw_addr_add_ex	2021-09-30 13:29:09 +01:00
dev_ioctl.c	net: core: don't call SIOCBRADD/DELIF for non-bridge devices	2021-08-05 11:36:59 +01:00
devlink.c	devlink: Remove misleading internal_flags from health reporter dump	2022-01-27 11:05:39 +01:00
drop_monitor.c	drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit	2022-02-23 12:03:12 +01:00
dst.c	net: Remove redundant if statements	2021-08-05 13:27:50 +01:00
dst_cache.c	wireguard: device: reset peer src endpoint when netns exits	2021-12-08 09:04:46 +01:00
failover.c	failover: allow name change on IFF_UP slave interfaces	2019-04-10 22:12:26 -07:00
fib_notifier.c	net: fib_notifier: propagate extack down to the notifier block callback	2019-10-04 11:10:56 -07:00
fib_rules.c	ipv6: fix memory leak in fib6_rule_suppress	2021-12-08 09:04:43 +01:00
filter.c	bpf: Fix request_sock leak in sk lookup helpers	2022-06-29 09:03:22 +02:00
flow_dissector.c	net/sched: flower: fix parsing of ethertype following VLAN header	2022-04-20 09:34:09 +02:00
flow_offload.c	netfilter: nf_tables: bail out early if hardware offload is not supported	2022-06-14 18:36:17 +02:00
gen_estimator.c	net_sched: gen_estimator: support large ewma log	2021-01-15 18:11:06 -08:00
gen_stats.c	docs: networking: convert gen_stats.txt to ReST	2020-04-28 14:39:46 -07:00
gro_cells.c	gro_cells: reduce number of synchronize_net() calls	2020-11-25 11:28:12 -08:00
hwbm.c	net: hwbm: Make the hwbm_pool lock a mutex	2019-06-09 19:40:10 -07:00
link_watch.c	net: Write lock dev_base_lock without disabling bottom halves.	2022-06-29 09:03:22 +02:00
lwt_bpf.c	bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook	2022-05-09 09:14:35 +02:00
lwtunnel.c	lwtunnel: Validate RTA_ENCAP_TYPE attribute length	2022-01-11 15:35:14 +01:00
neighbour.c	net, neigh: clear whole pneigh_entry at alloc time	2021-12-14 10:57:19 +01:00
net-procfs.c	net-procfs: show net devices bound packet types	2022-02-01 17:27:08 +01:00
net-sysfs.c	net: fix data-race in dev_isalive()	2022-06-29 09:03:22 +02:00
net-sysfs.h	net-sysfs: add netdev_change_owner()	2020-02-26 20:07:25 -08:00
net-traces.c	tcp: add tracepoint for checksum errors	2021-05-14 15:26:03 -07:00
net_namespace.c	net: initialize init_net earlier	2022-04-13 20:59:03 +02:00
netclassid_cgroup.c	bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode	2021-09-13 16:35:58 -07:00
netevent.c	net: core: Correct function name netevent_unregister_notifier() in the kerneldoc	2021-03-28 17:56:56 -07:00
netpoll.c	asm-generic/unaligned: Unify asm/unaligned.h around struct helper	2021-07-02 12:43:40 -07:00
netprio_cgroup.c	bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode	2021-09-13 16:35:58 -07:00
of_net.c	of: net: move of_net under net/	2022-03-08 19:12:41 +01:00
page_pool.c	page_pool: use relaxed atomic for release side accounting	2021-08-24 10:46:31 +01:00
pktgen.c	pktgen: remove unused variable	2021-09-03 11:48:28 +01:00
ptp_classifier.c	bpf: Refactor BPF_PROG_RUN into a function	2021-08-17 00:45:07 +02:00
request_sock.c	tcp: add rcu protection around tp->fastopen_rsk	2019-10-13 10:13:08 -07:00
rtnetlink.c	net: Write lock dev_base_lock without disabling bottom halves.	2022-06-29 09:03:22 +02:00
scm.c	memcg: enable accounting for scm_fp_list objects	2021-07-20 06:00:38 -07:00
secure_seq.c	tcp: resalt the secret every 10 seconds	2022-05-18 10:26:53 +02:00
selftests.c	net: selftests: add MTU test	2021-07-22 00:52:04 -07:00
skbuff.c	net: fix wrong network header length	2022-05-25 09:57:35 +02:00
skmsg.c	sock: redo the psock vs ULP protection check	2022-06-29 09:03:25 +02:00
sock.c	net-timestamp: convert sk->sk_tskey to atomic_t	2022-03-02 11:48:01 +01:00
sock_destructor.h	skb_expand_head() adjust skb->truesize incorrectly	2021-10-22 12:35:51 -07:00
sock_diag.c	bpf, net: Rework cookie generator as per-cpu one	2020-09-30 11:50:35 -07:00
sock_map.c	bpf: Introduce MEM_RDONLY flag	2022-05-01 17:22:24 +02:00
sock_reuseport.c	tcp: Add stats for socket migration.	2021-06-23 12:56:08 -07:00
stream.c	net: stream: don't purge sk_error_queue in sk_stream_kill_queues()	2021-11-18 19:16:34 +01:00
sysctl_net_core.c	bpf: Prevent increasing bpf_jit_limit above max	2021-10-22 17:23:53 -07:00
timestamping.c	net: Introduce a new MII time stamping interface.	2019-12-25 19:51:33 -08:00
tso.c	net: tso: add UDP segmentation support	2020-06-18 20:46:23 -07:00
utils.c	net: Fix skb->csum update in inet_proto_csum_replace16().	2020-01-24 20:54:30 +01:00
xdp.c	xdp: Move the rxq_info.mem clearing to unreg_mem_model()	2021-06-28 23:07:59 +02:00