]> git.baikalelectronics.ru Git - kernel.git/commit
mptcp: clear 'kern' flag from fallback sockets
authorFlorian Westphal <fw@strlen.de>
Tue, 14 Dec 2021 23:16:02 +0000 (15:16 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 15 Dec 2021 02:49:39 +0000 (18:49 -0800)
commitdafbd1aaa7e8e4cb5f673e67fc3f61f2433ad4eb
tree03b22daae259a1058a4d1ba03b05eb9346f208ea
parenta95d88152326095a9c19f9a2f8951b78e292650d
mptcp: clear 'kern' flag from fallback sockets

The mptcp ULP extension relies on sk->sk_sock_kern being set correctly:
It prevents setsockopt(fd, IPPROTO_TCP, TCP_ULP, "mptcp", 6); from
working for plain tcp sockets (any userspace-exposed socket).

But in case of fallback, accept() can return a plain tcp sk.
In such case, sk is still tagged as 'kernel' and setsockopt will work.

This will crash the kernel, The subflow extension has a NULL ctx->conn
mptcp socket:

BUG: KASAN: null-ptr-deref in subflow_data_ready+0x181/0x2b0
Call Trace:
 tcp_data_ready+0xf8/0x370
 [..]

Fixes: e16f0c73e49e ("mptcp: Create SUBFLOW socket for incoming connections")
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/protocol.c