mptcp: fix 'Attempt to release TCP socket in state' warnings (9f5ca6a5) · Commits · 戴 / test

We need to set sk_state to CLOSED, else we will get following: IPv4: Attempt to release TCP socket in state 3 00000000b95f109e IPv4: Attempt to release TCP socket in state 10 00000000b95f109e First one is from inet_sock_destruct(), second one from mptcp_sk_clone failure handling. Setting sk_state to CLOSED isn't enough, we also need to orphan sk so it has DEAD flag set. Otherwise, a very similar warning is printed from inet_sock_destruct(). Signed-off-by:

Florian Westphal <fw@strlen.de> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/mptcp/protocol.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1355,12 +1355,15 @@ struct sock mptcp_sk_clone(const struct sock sk, struct request_sock *req)
		msk->subflow = NULL;

		if (unlikely(mptcp_token_new_accept(subflow_req->token, nsk))) {
		nsk->sk_state = TCP_CLOSE;
		bh_unlock_sock(nsk);

		/* we can't call into mptcp_close() here - possible BH context
		* free the sock directly
		* free the sock directly.
		* sk_clone_lock() sets nsk refcnt to two, hence call sk_free()
		* too.
		*/
		nsk->sk_prot->destroy(nsk);
		sk_common_release(nsk);
		sk_free(nsk);
		return NULL;
		}

net/mptcp/subflow.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -370,6 +370,12 @@ static void mptcp_sock_destruct(struct sock *sk)
		inet_sock_destruct(sk);
		}

		static void mptcp_force_close(struct sock *sk)
		{
		inet_sk_state_store(sk, TCP_CLOSE);
		sk_common_release(sk);
		}

		static struct sock subflow_syn_recv_sock(const struct sock sk,
		struct sk_buff *skb,
		struct request_sock *req,
		@@ -467,7 +473,7 @@ create_child:
		out:
		/* dispose of the left over mptcp master, if any */
		if (unlikely(new_msk))
		sock_put(new_msk);
		mptcp_force_close(new_msk);
		return child;

		close_child:

Admin message