mptcp: dedicated request sock for subflow in v6

commit 34b21d1ddc8ace77a8fa35c1b1e06377209e0dae upstream.

tcp_request_sock_ops structure is specific to IPv4. It should then not
be used with MPTCP subflows on top of IPv6.

For example, it contains the 'family' field, initialised to AF_INET.
This 'family' field is used by TCP FastOpen code to generate the cookie
but also by TCP Metrics, SELinux and SYN Cookies. Using the wrong family
will not lead to crashes but displaying/using/checking wrong things.

Note that 'send_reset' callback from request_sock_ops structure is used
in some error paths. It is then also important to use the correct one
for IPv4 or IPv6.

The slab name can also be different in IPv4 and IPv6, it will be used
when printing some log messages. The slab pointer will anyway be the
same because the object size is the same for both v4 and v6. A
BUILD_BUG_ON() has also been added to make sure this size is the same.

Fixes: cec37a6e41aa ("mptcp: Handle MP_CAPABLE options for outgoing connections")
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 7a5d816ad47e79c424d96e82fda1a3a1cc539b57..c1d76ec65c42883ddd470497f29c88c8532ced03 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -483,7 +483,7 @@ do_reset:
        mptcp_subflow_reset(sk);
 }
 
-static struct request_sock_ops mptcp_subflow_request_sock_ops __ro_after_init;
+static struct request_sock_ops mptcp_subflow_v4_request_sock_ops __ro_after_init;
 static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops __ro_after_init;
 
 static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)
@@ -496,7 +496,7 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        if (skb_rtable(skb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
                goto drop;
 
-       return tcp_conn_request(&mptcp_subflow_request_sock_ops,
+       return tcp_conn_request(&mptcp_subflow_v4_request_sock_ops,
                                &subflow_request_sock_ipv4_ops,
                                sk, skb);
 drop:
@@ -505,6 +505,7 @@ drop:
 }
 
 #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;
 static struct inet_connection_sock_af_ops subflow_v6_specific __ro_after_init;
 static struct inet_connection_sock_af_ops subflow_v6m_specific __ro_after_init;
@@ -527,7 +528,7 @@ static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
                return 0;
        }
 
-       return tcp_conn_request(&mptcp_subflow_request_sock_ops,
+       return tcp_conn_request(&mptcp_subflow_v6_request_sock_ops,
                                &subflow_request_sock_ipv6_ops, sk, skb);
 
 drop:
@@ -540,7 +541,12 @@ struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *op
                                               struct sock *sk_listener,
                                               bool attach_listener)
 {
-       ops = &mptcp_subflow_request_sock_ops;
+       if (ops->family == AF_INET)
+               ops = &mptcp_subflow_v4_request_sock_ops;
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
+       else if (ops->family == AF_INET6)
+               ops = &mptcp_subflow_v6_request_sock_ops;
+#endif
 
        return inet_reqsk_alloc(ops, sk_listener, attach_listener);
 }
@@ -1791,7 +1797,6 @@ static struct tcp_ulp_ops subflow_ulp_ops __read_mostly = {
 static int subflow_ops_init(struct request_sock_ops *subflow_ops)
 {
        subflow_ops->obj_size = sizeof(struct mptcp_subflow_request_sock);
-       subflow_ops->slab_name = "request_sock_subflow";
 
        subflow_ops->slab = kmem_cache_create(subflow_ops->slab_name,
                                              subflow_ops->obj_size, 0,
@@ -1808,9 +1813,10 @@ static int subflow_ops_init(struct request_sock_ops *subflow_ops)
 
 void __init mptcp_subflow_init(void)
 {
-       mptcp_subflow_request_sock_ops = tcp_request_sock_ops;
-       if (subflow_ops_init(&mptcp_subflow_request_sock_ops) != 0)
-               panic("MPTCP: failed to init subflow request sock ops\n");
+       mptcp_subflow_v4_request_sock_ops = tcp_request_sock_ops;
+       mptcp_subflow_v4_request_sock_ops.slab_name = "request_sock_subflow_v4";
+       if (subflow_ops_init(&mptcp_subflow_v4_request_sock_ops) != 0)
+               panic("MPTCP: failed to init subflow v4 request sock ops\n");
 
        subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops;
        subflow_request_sock_ipv4_ops.route_req = subflow_v4_route_req;
@@ -1824,6 +1830,18 @@ void __init mptcp_subflow_init(void)
        tcp_prot_override.release_cb = tcp_release_cb_override;
 
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+       /* In struct mptcp_subflow_request_sock, we assume the TCP request sock
+        * structures for v4 and v6 have the same size. It should not changed in
+        * the future but better to make sure to be warned if it is no longer
+        * the case.
+        */
+       BUILD_BUG_ON(sizeof(struct tcp_request_sock) != sizeof(struct tcp6_request_sock));
+
+       mptcp_subflow_v6_request_sock_ops = tcp6_request_sock_ops;
+       mptcp_subflow_v6_request_sock_ops.slab_name = "request_sock_subflow_v6";
+       if (subflow_ops_init(&mptcp_subflow_v6_request_sock_ops) != 0)
+               panic("MPTCP: failed to init subflow v6 request sock ops\n");
+
        subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops;
        subflow_request_sock_ipv6_ops.route_req = subflow_v6_route_req;