Skip to content

Commit 404cd9a

Browse files
Florian Westphalkuba-moo
authored andcommitted
mptcp: remove tcp ulp setsockopt support
TCP_ULP setsockopt cannot be used for mptcp because its already used internally to plumb subflow (tcp) sockets to the mptcp layer. syzbot managed to trigger a crash for mptcp connections that are in fallback mode: KASAN: null-ptr-deref in range [0x0000000000000020-0x0000000000000027] CPU: 1 PID: 1083 Comm: syz-executor.3 Not tainted 5.16.0-rc2-syzkaller #0 RIP: 0010:tls_build_proto net/tls/tls_main.c:776 [inline] [..] __tcp_set_ulp net/ipv4/tcp_ulp.c:139 [inline] tcp_set_ulp+0x428/0x4c0 net/ipv4/tcp_ulp.c:160 do_tcp_setsockopt+0x455/0x37c0 net/ipv4/tcp.c:3391 mptcp_setsockopt+0x1b47/0x2400 net/mptcp/sockopt.c:638 Remove support for TCP_ULP setsockopt. Fixes: d9e4c12 ("mptcp: only admit explicitly supported sockopt") Reported-by: syzbot+1fd9b69cde42967d1add@syzkaller.appspotmail.com Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 3dd7d40 commit 404cd9a

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

net/mptcp/sockopt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ static bool mptcp_supported_sockopt(int level, int optname)
525525
case TCP_NODELAY:
526526
case TCP_THIN_LINEAR_TIMEOUTS:
527527
case TCP_CONGESTION:
528-
case TCP_ULP:
529528
case TCP_CORK:
530529
case TCP_KEEPIDLE:
531530
case TCP_KEEPINTVL:

0 commit comments

Comments
 (0)