Skip to content

Commit 10e54bf

Browse files
matttbegregkh
authored andcommitted
mptcp: tfo: record 'deny join id0' info
[ Upstream commit 92da495 ] When TFO is used, the check to see if the 'C' flag (deny join id0) was set was bypassed. This flag can be set when TFO is used, so the check should also be done when TFO is used. Note that the set_fully_established label is also used when a 4th ACK is received. In this case, deny_join_id0 will not be set. Fixes: dfc8d06 ("mptcp: implement delayed seq generation for passive fastopen") Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20250912-net-mptcp-pm-uspace-deny_join_id0-v1-4-40171884ade8@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent bb7a3f0 commit 10e54bf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

net/mptcp/options.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -985,13 +985,13 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
985985
return false;
986986
}
987987

988-
if (mp_opt->deny_join_id0)
989-
WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
990-
991988
if (unlikely(!READ_ONCE(msk->pm.server_side)))
992989
pr_warn_once("bogus mpc option on established client sk");
993990

994991
set_fully_established:
992+
if (mp_opt->deny_join_id0)
993+
WRITE_ONCE(msk->pm.remote_deny_join_id0, true);
994+
995995
mptcp_data_lock((struct sock *)msk);
996996
__mptcp_subflow_fully_established(msk, subflow, mp_opt);
997997
mptcp_data_unlock((struct sock *)msk);

0 commit comments

Comments
 (0)