Commit a38a211e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-fix-ipv6-reqsk-ops-and-some-netlink-error-codes' 

Mat Martineau says:

====================
mptcp: Fix IPv6 reqsk ops and some netlink error codes

Patch 1 adds some missing error status values for MPTCP path management
netlink commands with invalid attributes.

Patches 2-4 make IPv6 subflows use the correct request_sock_ops
structure and IPv6-specific destructor. The first patch in this group is
a prerequisite change that simplifies the last two patches.
====================

Link: https://lore.kernel.org/r/20221210002810.289674-1-mathew.j.martineau@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 84698dad d3295fee

include/net/mptcp.h

+10 −2
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ struct mptcp_out_options { 
};



#ifdef CONFIG_MPTCP

extern struct request_sock_ops mptcp_subflow_request_sock_ops;



void mptcp_init(void);



static inline bool sk_is_mptcp(const struct sock *sk)
@@ -188,6 +186,9 @@ void mptcp_seq_show(struct seq_file *seq); 
int mptcp_subflow_init_cookie_req(struct request_sock *req,

				  const struct sock *sk_listener,

				  struct sk_buff *skb);

struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops,

					       struct sock *sk_listener,

					       bool attach_listener);



__be32 mptcp_get_reset_option(const struct sk_buff *skb);
@@ -274,6 +275,13 @@ static inline int mptcp_subflow_init_cookie_req(struct request_sock *req, 
	return 0; /* TCP fallback */

}



static inline struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops,

							     struct sock *sk_listener,

							     bool attach_listener)

{

	return NULL;

}



static inline __be32 mptcp_reset_option(const struct sk_buff *skb)  { return htonl(0u); }

#endif /* CONFIG_MPTCP */

net/ipv4/syncookies.c

+3 −4
Original line number Diff line number Diff line
@@ -288,12 +288,11 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops, 
	struct tcp_request_sock *treq;

	struct request_sock *req;



#ifdef CONFIG_MPTCP

	if (sk_is_mptcp(sk))

		ops = &mptcp_subflow_request_sock_ops;

#endif



		req = mptcp_subflow_reqsk_alloc(ops, sk, false);

	else

		req = inet_reqsk_alloc(ops, sk, false);



	if (!req)

		return NULL;

net/mptcp/pm_userspace.c

+4 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) 


	if (addr_val.addr.id == 0 || !(addr_val.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {

		GENL_SET_ERR_MSG(info, "invalid addr id or flags");

		err = -EINVAL;

		goto announce_err;

	}
@@ -282,6 +283,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) 


	if (addr_l.id == 0) {

		NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id");

		err = -EINVAL;

		goto create_err;

	}
@@ -395,11 +397,13 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) 


	if (addr_l.family != addr_r.family) {

		GENL_SET_ERR_MSG(info, "address families do not match");

		err = -EINVAL;

		goto destroy_err;

	}



	if (!addr_l.port || !addr_r.port) {

		GENL_SET_ERR_MSG(info, "missing local or remote port");

		err = -EINVAL;

		goto destroy_err;

	}

net/mptcp/subflow.c

+51 −10
Original line number Diff line number Diff line
@@ -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,
@@ -529,7 +528,7 @@ static int subflow_v6_rebuild_header(struct sock *sk) 
}

#endif



struct request_sock_ops mptcp_subflow_request_sock_ops;

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)
@@ -542,7 +541,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:
@@ -550,7 +549,14 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
	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;

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;
@@ -573,15 +579,36 @@ 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:

	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,

					       struct sock *sk_listener,

					       bool attach_listener)

{

	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);

}

EXPORT_SYMBOL(mptcp_subflow_reqsk_alloc);



/* validate hmac received in third ACK */

static bool subflow_hmac_valid(const struct request_sock *req,

			       const struct mptcp_options_received *mp_opt)
@@ -1904,7 +1931,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,
@@ -1914,16 +1940,17 @@ 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;

}



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";

	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");



	subflow_request_sock_ipv4_ops = tcp_request_sock_ipv4_ops;

	subflow_request_sock_ipv4_ops.route_req = subflow_v4_route_req;
@@ -1938,6 +1965,20 @@ 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";

	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");



	subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops;

	subflow_request_sock_ipv6_ops.route_req = subflow_v6_route_req;