mptcp: replace mptcp_disconnect with a stub
Subsystems (2)
Florian Westphal
PATCH 1/1 mptcp: replace mptcp_disconnect with a stub
Paolo points out that mptcp_disconnect is bogus:
"lock_sock(sk);
looks suspicious (lock should be already held by the caller) And call to: tcp_disconnect(sk, flags); too, sk is not a tcp socket".
->disconnect() gets called from e.g. inet_stream_connect when one tries to disassociate a connected socket again (to re-connect without closing the socket first).
MPTCP however uses mptcp_stream_connect, not inet_stream_connect, for the mptcp-socket connect call.
inet_stream_connect only gets called indirectly, for the tcp socket, so any ->disconnect() calls end up calling tcp_disconnect for that tcp subflow sk.
This also explains why syzkaller has not yet reported a problem here. So for now replace this with a stub that doesn't do anything.
--- net/mptcp/protocol.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/mptcp/protocol.c +6 -5
@@ -1316,11 +1316,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -lock_sock (sk); -__mptcp_clear_xmit (sk); -release_sock (sk); -mptcp_cancel_work (sk); -return tcp_disconnect (sk, flags); +/* Should never be called. +* inet_stream_connect() calls ->disconnect, but that +* refers to the subflow socket, not the mptcp one. +*/ +WARN_ON_ONCE (1 ); +return 0 ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 )
Signature · 1 line
2.26.2
Paolo Abeni
Acked-by on v1 1/1Quoted 37 lines · Florian Westphal
Paolo points out that
mptcp_disconnectis bogus:
"lock_sock(sk);
looks suspicious (lock should be already held by the caller) And call to:tcp_disconnect(sk, flags); too, sk is not a tcp socket".->disconnect() gets called from e.g.
inet_stream_connectwhen one tries to disassociate a connected socket again (to re-connect without closing the socket first).
MPTCP however usesmptcp_stream_connect, notinet_stream_connect, for the mptcp-socket connect call.
inet_stream_connectonly gets called indirectly, for the tcp socket, so any ->disconnect() calls end up callingtcp_disconnectfor that tcp subflow sk.This also explains why syzkaller has not yet reported a problem here. So for now replace this with a stub that doesn't do anything.
Signed-off-by Florian Westphal <fw(a)strlen.de>--- net/mptcp/protocol.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)net/mptcp/protocol.c +0
-4@@ -1316,11 +1316,12 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)static int mptcp_disconnect (struct sock *sk,int flags) { -lock_sock (sk); -__mptcp_clear_xmit (sk); -release_sock (sk); -mptcp_cancel_work (sk);
net/mptcp/protocol.c static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) · line 1327
Quoted 10 lines
net/mptcp/protocol.c +6
-1-return tcp_disconnect (sk, flags); +/* Should never be called. +* inet_stream_connect() calls ->disconnect, but that +* refers to the subflow socket, not the mptcp one. +*/ +WARN_ON_ONCE (1 ); +return 0 ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 )
LGTM, Thanks!