From: Florian Westphal <fw@strlen.de>
To: <mptcp@lists.linux.dev>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH mptcp 1/2] mptcp: clear 'kern' flag from fallback sockets
Date: Mon, 6 Dec 2021 16:51:19 +0100 [thread overview]
Message-ID: <20211206155120.26929-2-fw@strlen.de> (raw)
In-Reply-To: <20211206155120.26929-1-fw@strlen.de>
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: cf7da0d66cc1 ("mptcp: Create SUBFLOW socket for incoming connections")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/mptcp/protocol.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 8319e601bc2d..34ea4b25128e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3025,6 +3025,7 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK);
}
+ newsk->sk_kern_sock = kern;
return newsk;
}
--
2.32.0
next prev parent reply other threads:[~2021-12-06 15:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 15:51 [PATCH mptcp 0/2] mptcp: fix crash with mptcp-ulp on tcp sockets Florian Westphal
2021-12-06 15:51 ` Florian Westphal [this message]
2021-12-06 19:40 ` [PATCH mptcp 1/2] mptcp: clear 'kern' flag from fallback sockets Mat Martineau
2021-12-06 21:26 ` [PATCH v2 " Florian Westphal
2021-12-06 21:49 ` Mat Martineau
2021-12-10 1:38 ` Mat Martineau
2021-12-10 9:00 ` Florian Westphal
2021-12-10 10:46 ` Paolo Abeni
2021-12-10 20:48 ` Mat Martineau
2021-12-10 23:04 ` Mat Martineau
2021-12-06 15:51 ` [PATCH mptcp 2/2] selftests: mptcp: try to set mptcp ulp mode in different sk states Florian Westphal
2021-12-07 13:57 ` [PATCH mptcp 0/2] mptcp: fix crash with mptcp-ulp on tcp sockets Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206155120.26929-2-fw@strlen.de \
--to=fw@strlen.de \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.