Commit 131a6277 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: avoid unneeded mptcp_token_destroy() calls 



The MPTCP protocol currently clears the msk token both at connect() and
listen() time. That is needed to deal with failing connect() calls that
can create a new token while leaving the sk in TCP_CLOSE,SS_UNCONNECTED
status and thus allowing later connect() and/or listen() calls.

Let's deal with such failures explicitly, cleaning the token in a timely
manner and avoid the confusing early mptcp_token_destroy().

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f614a29d

net/mptcp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -3594,7 +3594,6 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	if (IS_ERR(ssock))

		return PTR_ERR(ssock);



	mptcp_token_destroy(msk);

	inet_sk_state_store(sk, TCP_SYN_SENT);

	subflow = mptcp_subflow_ctx(ssock->sk);

#ifdef CONFIG_TCP_MD5SIG
@@ -3624,6 +3623,8 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	 * subflow_finish_connect()

	 */

	if (unlikely(err && err != -EINPROGRESS)) {

		/* avoid leaving a dangling token in an unconnected socket */

		mptcp_token_destroy(msk);

		inet_sk_state_store(sk, inet_sk_state_load(ssock->sk));

		return err;

	}
@@ -3713,7 +3714,6 @@ static int mptcp_listen(struct socket *sock, int backlog) 
		goto unlock;

	}



	mptcp_token_destroy(msk);

	inet_sk_state_store(sk, TCP_LISTEN);

	sock_set_flag(sk, SOCK_RCU_FREE);