]> www.infradead.org Git - users/jedix/linux-maple.git/commit
l2tp: avoid overriding sk->sk_user_data
authorCong Wang <cong.wang@bytedance.com>
Thu, 22 Aug 2024 18:25:44 +0000 (11:25 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 26 Aug 2024 16:55:40 +0000 (09:55 -0700)
commit1461f5a3d810869e182f1d11caaac7dee0458ff7
tree41bf49633545c056b7357227ad56384db30b1c70
parent7888173eb18063c15e10d099310a58ab8c3a4b44
l2tp: avoid overriding sk->sk_user_data

Although commit 4a4cd70369f1 ("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: 4a4cd70369f1 ("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>
net/l2tp/l2tp_core.c