linux-stable/net/mptcp
Florian Westphal 451f1eded7 mptcp: clear 'kern' flag from fallback sockets
[ Upstream commit d6692b3b97 ]

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: cf7da0d66c ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-12-22 09:30:54 +01:00
..
crypto.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2020-08-05 20:13:21 -07:00
crypto_test.c mptcp: move crypto test to KUNIT 2020-06-26 16:21:39 -07:00
ctrl.c mptcp: enable JOIN requests even if cookies are in use 2020-07-31 16:55:32 -07:00
diag.c mptcp: allow dumping subflow context to userspace 2020-03-29 22:14:48 -07:00
Kconfig mptcp: depends on IPV6 but not as a module 2020-10-21 08:05:40 -07:00
Makefile mptcp: enable JOIN requests even if cookies are in use 2020-07-31 16:55:32 -07:00
mib.c mptcp: print new line in mptcp_seq_show() if mptcp isn't in use 2020-12-07 17:45:29 -08:00
mib.h mptcp: add RM_ADDR related mibs 2020-09-24 19:58:34 -07:00
mptcp_diag.c mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00
options.c mptcp: fix delack timer 2021-12-01 09:19:04 +01:00
pm.c mptcp: ADD_ADDRs with echo bit are smaller 2020-10-03 17:36:37 -07:00
pm_netlink.c mptcp: Constify mptcp_pm_ops 2020-10-04 21:13:36 -07:00
protocol.c mptcp: clear 'kern' flag from fallback sockets 2021-12-22 09:30:54 +01:00
protocol.h mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00
subflow.c mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00
syncookies.c mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00
token.c mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00
token_test.c mptcp: don't return sockets in foreign netns 2021-10-06 15:55:52 +02:00