This is a note to let you know that I've just added the patch titled
mptcp: avoid printing warning once on client side
to the 6.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mptcp-avoid-printing-warning-once-on-client-side.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5b49c41ac8f27aa3a63a1712b1f54f91015c18f2 Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx>
Date: Fri, 23 Feb 2024 17:14:13 +0100
Subject: mptcp: avoid printing warning once on client side
From: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
commit 5b49c41ac8f27aa3a63a1712b1f54f91015c18f2 upstream.
After the 'Fixes' commit mentioned below, the client side might print
the following warning once when a subflow is fully established at the
reception of any valid additional ack:
MPTCP: bogus mpc option on established client sk
That's a normal situation, and no warning should be printed for that. We
can then skip the check when the label is used.
Fixes: e4a0fa47e816 ("mptcp: corner case locking for rx path fields initialization")
Cc: stable@xxxxxxxxxxxxxxx
Suggested-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Reviewed-by: Mat Martineau <martineau@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-3-162e87e48497@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mptcp/options.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -981,10 +981,10 @@ static bool check_fully_established(stru
if (mp_opt->deny_join_id0)
WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
-set_fully_established:
if (unlikely(!READ_ONCE(msk->pm.server_side)))
pr_warn_once("bogus mpc option on established client sk");
+set_fully_established:
mptcp_data_lock((struct sock *)msk);
__mptcp_subflow_fully_established(msk, subflow, mp_opt);
mptcp_data_unlock((struct sock *)msk);
Patches currently in stable-queue which might be from matttbe@xxxxxxxxxx are
queue-6.7/mptcp-push-at-dss-boundaries.patch
queue-6.7/mptcp-fix-double-free-on-socket-dismantle.patch
queue-6.7/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch
queue-6.7/mptcp-map-v4-address-to-v6-when-destroying-subflow.patch
queue-6.7/mptcp-fix-potential-wake-up-event-loss.patch
queue-6.7/selftests-mptcp-join-add-ss-mptcp-support-check.patch
queue-6.7/mptcp-fix-possible-deadlock-in-subflow-diag.patch
queue-6.7/mptcp-avoid-printing-warning-once-on-client-side.patch
