Commit 1461f5a3 authored by Cong Wang's avatar Cong Wang Committed by Jakub Kicinski
Browse files

l2tp: avoid overriding sk->sk_user_data



Although commit 4a4cd703 ("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: 4a4cd703 ("l2tp: don't set sk_user_data in tunnel socket")
Reported-by: default avatar <syzbot+8dbe3133b840c470da0e@syzkaller.appspotmail.com>
Cc: Tom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Tested-by: default avatarJames Chapman <jchapman@katalix.com>
Reviewed-by: default avatarJames Chapman <jchapman@katalix.com>
Link: https://patch.msgid.link/20240822182544.378169-1-xiyou.wangcong@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7888173e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment