linux/net/l2tp
Cong Wang 1461f5a3d8 l2tp: avoid overriding sk->sk_user_data
Although commit 4a4cd70369 ("l2tp: don't set sk_user_data in tunnel socket")
removed sk->sk_user_data usage, setup_udp_tunnel_sock() still touches
sk->sk_user_data, this conflicts with sockmap which also leverages
sk->sk_user_data to save psock.

Restore this sk->sk_user_data check to avoid such conflicts.

Fixes: 4a4cd70369 ("l2tp: don't set sk_user_data in tunnel socket")
Reported-by: syzbot+8dbe3133b840c470da0e@syzkaller.appspotmail.com
Cc: Tom Parkin <tparkin@katalix.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Tested-by: James Chapman <jchapman@katalix.com>
Reviewed-by: James Chapman <jchapman@katalix.com>
Link: https://patch.msgid.link/20240822182544.378169-1-xiyou.wangcong@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-08-26 09:55:40 -07:00
..
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
l2tp_core.c l2tp: avoid overriding sk->sk_user_data 2024-08-26 09:55:40 -07:00
l2tp_core.h l2tp: improve tunnel/session refcount helpers 2024-08-11 04:38:50 +01:00
l2tp_debugfs.c l2tp: improve tunnel/session refcount helpers 2024-08-11 04:38:50 +01:00
l2tp_eth.c l2tp: l2tp_eth: use per-cpu counters from dev->tstats 2024-08-11 04:38:50 +01:00
l2tp_ip6.c l2tp: improve tunnel/session refcount helpers 2024-08-11 04:38:50 +01:00
l2tp_ip.c l2tp: use skb_queue_purge in l2tp_ip_destroy_sock 2024-08-20 16:52:28 -07:00
l2tp_netlink.c l2tp: improve tunnel/session refcount helpers 2024-08-11 04:38:50 +01:00
l2tp_ppp.c l2tp: improve tunnel/session refcount helpers 2024-08-11 04:38:50 +01:00
Makefile l2tp: add tracepoint infrastructure to core 2020-08-22 12:44:37 -07:00
trace.h l2tp: add tracepoint definitions in trace.h 2020-08-22 12:44:37 -07:00