mptcp: use proper req destructor for IPv6

commit d3295fee3c756ece33ac0d935e172e68c0a4161b upstream.

Before, only the destructor from TCP request sock in IPv4 was called
even if the subflow was IPv6.

It is important to use the right destructor to avoid memory leaks with
some advanced IPv6 features, e.g. when the request socks contain
specific IPv6 options.

Fixes: 79c0949e9a09 ("mptcp: Add key generation and token tree")
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index c1d76ec..ba4241d 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -45,7 +45,6 @@ static void subflow_req_destructor(struct request_sock *req)
                sock_put((struct sock *)subflow_req->msk);
 
        mptcp_token_destroy_request(req);
-       tcp_request_sock_ops.destructor(req);
 }
 
 static void subflow_generate_hmac(u64 key1, u64 key2, u32 nonce1, u32 nonce2,
@@ -504,6 +503,12 @@ drop:
        return 0;
 }
 
+static void subflow_v4_req_destructor(struct request_sock *req)
+{
+       subflow_req_destructor(req);
+       tcp_request_sock_ops.destructor(req);
+}
+
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
 static struct request_sock_ops mptcp_subflow_v6_request_sock_ops __ro_after_init;
 static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops __ro_after_init;
@@ -535,6 +540,12 @@ drop:
        tcp_listendrop(sk);
        return 0; /* don't send reset */
 }
+
+static void subflow_v6_req_destructor(struct request_sock *req)
+{
+       subflow_req_destructor(req);
+       tcp6_request_sock_ops.destructor(req);
+}
 #endif
 
 struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops,
@@ -1806,8 +1817,6 @@ static int subflow_ops_init(struct request_sock_ops *subflow_ops)
        if (!subflow_ops->slab)
                return -ENOMEM;
 
-       subflow_ops->destructor = subflow_req_destructor;
-
        return 0;
 }
 
@@ -1815,6 +1824,8 @@ void __init mptcp_subflow_init(void)
 {
        mptcp_subflow_v4_request_sock_ops = tcp_request_sock_ops;
        mptcp_subflow_v4_request_sock_ops.slab_name = "request_sock_subflow_v4";
+       mptcp_subflow_v4_request_sock_ops.destructor = subflow_v4_req_destructor;
+
        if (subflow_ops_init(&mptcp_subflow_v4_request_sock_ops) != 0)
                panic("MPTCP: failed to init subflow v4 request sock ops\n");
 
@@ -1839,6 +1850,8 @@ void __init mptcp_subflow_init(void)
 
        mptcp_subflow_v6_request_sock_ops = tcp6_request_sock_ops;
        mptcp_subflow_v6_request_sock_ops.slab_name = "request_sock_subflow_v6";
+       mptcp_subflow_v6_request_sock_ops.destructor = subflow_v6_req_destructor;
+
        if (subflow_ops_init(&mptcp_subflow_v6_request_sock_ops) != 0)
                panic("MPTCP: failed to init subflow v6 request sock ops\n");