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

mptcp: mark ops structures as ro_after_init 

stable inclusion
from stable-v5.10.163
commit 5aa15a8400cc3f05e7884975f29fa0c1f9362f2e
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=5aa15a8400cc3f05e7884975f29fa0c1f9362f2e



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

From: Florian Westphal <fw@strlen.de>

commit 51fa7f8e upstream.

These structures are initialised from the init hooks, so we can't make
them 'const'.  But no writes occur afterwards, so we can use ro_after_init.

Also, remove bogus EXPORT_SYMBOL, the only access comes from ip
stack, not from kernel modules.

Cc: stable@vger.kernel.org # 5.10
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
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 5b5cee12

net/mptcp/subflow.c

+7 −8
Original line number Diff line number Diff line
@@ -360,8 +360,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
}



struct request_sock_ops mptcp_subflow_request_sock_ops;

EXPORT_SYMBOL_GPL(mptcp_subflow_request_sock_ops);

static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops;

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)

{
@@ -382,9 +381,9 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
}



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

static struct tcp_request_sock_ops subflow_request_sock_ipv6_ops;

static struct inet_connection_sock_af_ops subflow_v6_specific;

static struct inet_connection_sock_af_ops subflow_v6m_specific;

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;



static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)

{
@@ -636,7 +635,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, 
	return child;

}



static struct inet_connection_sock_af_ops subflow_specific;

static struct inet_connection_sock_af_ops subflow_specific __ro_after_init;



enum mapping_status {

	MAPPING_OK,
@@ -1017,7 +1016,7 @@ static void subflow_write_space(struct sock *sk) 
	}

}



static struct inet_connection_sock_af_ops *

static const struct inet_connection_sock_af_ops *

subflow_default_af_ops(struct sock *sk)

{

#if IS_ENABLED(CONFIG_MPTCP_IPV6)
@@ -1032,7 +1031,7 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped) 
{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct inet_connection_sock_af_ops *target;

	const struct inet_connection_sock_af_ops *target;



	target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk);