Commit fe571800 authored by Mat Martineau's avatar Mat Martineau Committed by zhaoxiaoqiang11
Browse files

mptcp: remove MPTCP 'ifdef' in TCP SYN cookies 

stable inclusion
from stable-v5.10.163
commit 31472f94c68f5d9ebdd3432544044a9c27ea39d9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=31472f94c68f5d9ebdd3432544044a9c27ea39d9



----------------------------------------------------

From: Matthieu Baerts <matthieu.baerts@tessares.net>

commit 3fff8818 upstream.

To ease the maintenance, it is often recommended to avoid having #ifdef
preprocessor conditions.

Here the section related to CONFIG_MPTCP was quite short but the next
commit needs to add more code around. It is then cleaner to move
specific MPTCP code to functions located in net/mptcp directory.

Now that mptcp_subflow_request_sock_ops structure can be static, it can
also be marked as "read only after init".

Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Cc: stable@vger.kernel.org # 5.10
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarzhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>
parent 3b8afded

include/net/mptcp.h

+10 −2
Original line number Diff line number Diff line
@@ -58,8 +58,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)
@@ -133,6 +131,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);

#else



static inline void mptcp_init(void)
@@ -208,6 +209,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;

}

#endif /* CONFIG_MPTCP */



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

net/ipv4/syncookies.c

+3 −4
Original line number Diff line number Diff line
@@ -290,12 +290,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/subflow.c

+11 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
	mptcp_subflow_reset(sk);

}



struct request_sock_ops mptcp_subflow_request_sock_ops;

static struct request_sock_ops mptcp_subflow_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)
@@ -411,6 +411,16 @@ static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
}

#endif



struct request_sock *mptcp_subflow_reqsk_alloc(const struct request_sock_ops *ops,

					       struct sock *sk_listener,

					       bool attach_listener)

{

	ops = &mptcp_subflow_request_sock_ops;



	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)