Skip to content

Commit 367fe04

Browse files
matttbedavem330
authored andcommitted
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: 41be81a ("mptcp: fix unblocking connect()") Signed-off-by: Matthieu Baerts <[email protected]> Acked-by: Paolo Abeni <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 04300d6 commit 367fe04

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mptcp/protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr,
18331833
/* on successful connect, the msk state will be moved to established by
18341834
* subflow_finish_connect()
18351835
*/
1836-
if (!err || err == EINPROGRESS)
1836+
if (!err || err == -EINPROGRESS)
18371837
mptcp_copy_inaddrs(sock->sk, ssock->sk);
18381838
else
18391839
inet_sk_state_store(sock->sk, inet_sk_state_load(ssock->sk));

0 commit comments

Comments
 (0)