]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
mptcp: replace mptcp_disconnect with a stub
authorFlorian Westphal <fw@strlen.de>
Wed, 29 Apr 2020 18:43:20 +0000 (20:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2020 19:39:49 +0000 (12:39 -0700)
commit42c556fef92361bbc58be22f91b1c49db0963c34
treee077ddcb5cadbe3ed663100a8a0bd2c2060f72a6
parent9812307491231974f8eef1329237ce3d27da7462
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.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/14
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mptcp/protocol.c