mptcp: plug subflow context memory leak

When a MPTCP listener socket is closed with unaccepted
children pending, the ULP release callback will be invoked,
but nobody will call into __mptcp_close_ssk() on the
corresponding subflow.

As a consequence, at ULP release time, the 'disposable' flag
will be cleared and the subflow context memory will be leaked.

This change addresses the issue always freeing the context if
the subflow is still in the accept queue at ULP release time.

Additionally, this fixes an incorrect code reference in the
related comment.

Note: this fix leverages the changes introduced by the previous
commit.

Fixes: e16163b6e2b7 ("mptcp: refactor shutdown and close")
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 9b5a966b0041c1b6381f8abdd4a36342c9265e2d..fefcaf49793880765f2db6d38c8986d8ae2ab260 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -1339,9 +1339,10 @@ static void subflow_ulp_release(struct sock *ssk)
        sk = ctx->conn;
        if (sk) {
                /* if the msk has been orphaned, keep the ctx
-                * alive, will be freed by mptcp_done()
+                * alive, will be freed by __mptcp_close_ssk(),
+                * when the subflow is still unaccepted
                 */
-               release = ctx->disposable;
+               release = ctx->disposable || list_empty(&ctx->node);
                sock_put(sk);
        }