]> git.baikalelectronics.ru Git - kernel.git/commit
mptcp: remove tcp ulp setsockopt support
authorFlorian Westphal <fw@strlen.de>
Tue, 14 Dec 2021 23:16:01 +0000 (15:16 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 15 Dec 2021 02:49:39 +0000 (18:49 -0800)
commita95d88152326095a9c19f9a2f8951b78e292650d
tree9279376da6780923ad0b7ed95e2dd6dc2206ac7a
parentb8b633b583f983f0d10750e349f3ad209d13a048
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: d12996ccd277 ("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>
net/mptcp/sockopt.c