Commit 367fe04e authored Jul 27, 2020 by Matthieu Baerts Committed by David S. Miller Jul 27, 2020

mptcp: fix joined subflows with unblocking sk



Unblocking sockets used for outgoing connections were not containing
inet info about the initial connection due to a typo there: the value of
"err" variable is negative in the kernelspace.

This fixes the creation of additional subflows where the remote port has
to be reused if the other host didn't announce another one. This also
fixes inet_diag showing blank info about MPTCP sockets from unblocking
sockets doing a connect().

Fixes: 41be81a8 ("mptcp: fix unblocking connect()")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 04300d66

net/mptcp/protocol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1833,7 +1833,7 @@ do_connect:
		/* on successful connect, the msk state will be moved to established by
		* subflow_finish_connect()
		*/
		if (!err \|\| err == EINPROGRESS)
		if (!err \|\| err == -EINPROGRESS)
		mptcp_copy_inaddrs(sock->sk, ssock->sk);
		else
		inet_sk_state_store(sock->sk, inet_sk_state_load(ssock->sk));

Admin message