mptcp: fix 'Attempt to release TCP socket in state' warnings

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>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1c8b021b4537e55ed49c376fbc78734abc7c2bf8..7e816c733ccbc00588558667929dcd3006f6bf9f 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -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;
        }

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 57a836fe4988ce63d5027f67ce242c921ddce734..bc46b5091b9d510e21b3226a6fa5738d59915dc2 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -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: