summaryrefslogtreecommitdiff
path: root/net/mptcp/diag.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-10-28 15:55:48 -0700
committerJakub Kicinski <kuba@kernel.org>2024-10-28 15:55:48 -0700
commit825199bf2017e4549586f038ede9acec68de883d (patch)
tree797f92f5cfd258a8955d207c9c8e9a18e2840ef0 /net/mptcp/diag.c
parentfbb26ecc550200afcc15b121218fe7ec29bae219 (diff)
parent46a3282b87b1f9a88534eba59ecf852b2a21289c (diff)
Merge branch 'mptcp-various-small-improvements'
Matthieu Baerts says: ==================== mptcp: various small improvements The following patches are not related to each other. - Patch 1: Avoid sending advertisements on stale subflows, reducing risks on loosing them. - Patch 2: Annotate data-races around subflow->fully_established, using READ/WRITE_ONCE(). - Patch 3: A small clean-up on the PM side, avoiding a bit of duplicated code. - Patch 4: Use "Middlebox interference" MP_TCPRST code in reaction to a packet received without MPTCP options in the middle of a connection. ==================== Link: https://patch.msgid.link/20241021-net-next-mptcp-misc-6-13-v1-0-1ef02746504a@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/diag.c')
-rw-r--r--net/mptcp/diag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/diag.c b/net/mptcp/diag.c
index 2d3efb405437..02205f7994d7 100644
--- a/net/mptcp/diag.c
+++ b/net/mptcp/diag.c
@@ -47,7 +47,7 @@ static int subflow_get_info(struct sock *sk, struct sk_buff *skb)
flags |= MPTCP_SUBFLOW_FLAG_BKUP_REM;
if (sf->request_bkup)
flags |= MPTCP_SUBFLOW_FLAG_BKUP_LOC;
- if (sf->fully_established)
+ if (READ_ONCE(sf->fully_established))
flags |= MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED;
if (sf->conn_finished)
flags |= MPTCP_SUBFLOW_FLAG_CONNECTED;