From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: mptcp@lists.linux.dev, "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Menglong Dong <imagedong@tencent.com>,
Mengen Sun <mengensun@tencent.com>, Shuah Khan <shuah@kernel.org>,
Florian Westphal <fw@strlen.de>,
Jiang Biao <benbjiang@tencent.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Geliang Tang <geliang.tang@suse.com>,
stable@vger.kernel.org
Subject: [PATCH net 6/7] mptcp: add ro_after_init for tcp{,v6}_prot_override
Date: Mon, 27 Feb 2023 18:29:29 +0100 [thread overview]
Message-ID: <20230227-upstream-net-20230227-mptcp-fixes-v1-6-070e30ae4a8e@tessares.net> (raw)
In-Reply-To: <20230227-upstream-net-20230227-mptcp-fixes-v1-0-070e30ae4a8e@tessares.net>
From: Geliang Tang <geliang.tang@suse.com>
Add __ro_after_init labels for the variables tcp_prot_override and
tcpv6_prot_override, just like other variables adjacent to them, to
indicate that they are initialised from the init hooks and no writes
occur afterwards.
Fixes: b19bc2945b40 ("mptcp: implement delegated actions")
Cc: stable@vger.kernel.org
Fixes: 51fa7f8ebf0e ("mptcp: mark ops structures as ro_after_init")
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
net/mptcp/subflow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 5a3b17811b6b..f6b4511b09b0 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -628,7 +628,7 @@ 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;
-static struct proto tcpv6_prot_override;
+static struct proto tcpv6_prot_override __ro_after_init;
static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
{
@@ -926,7 +926,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
}
static struct inet_connection_sock_af_ops subflow_specific __ro_after_init;
-static struct proto tcp_prot_override;
+static struct proto tcp_prot_override __ro_after_init;
enum mapping_status {
MAPPING_OK,
--
2.38.1
next prev parent reply other threads:[~2023-02-27 17:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 17:29 [PATCH net 0/7] mptcp: fixes for 6.3 Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 1/7] mptcp: fix possible deadlock in subflow_error_report Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 2/7] mptcp: refactor passive socket initialization Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 3/7] mptcp: use the workqueue to destroy unaccepted sockets Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 4/7] mptcp: fix UaF in listener shutdown Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 5/7] selftests: mptcp: userspace pm: fix printed values Matthieu Baerts
2023-02-27 17:29 ` Matthieu Baerts [this message]
2023-02-27 17:29 ` [PATCH net 7/7] mptcp: avoid setting TCP_CLOSE state twice Matthieu Baerts
2023-02-28 11:28 ` [PATCH net 0/7] mptcp: fixes for 6.3 Matthieu Baerts
2023-02-28 11:33 ` Paolo Abeni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227-upstream-net-20230227-mptcp-fixes-v1-6-070e30ae4a8e@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=benbjiang@tencent.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=geliang.tang@suse.com \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mengensun@tencent.com \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).