Skip to content

Commit be1d9d9

Browse files
edumazetkuba-moo
authored andcommitted
mptcp: use OPTION_MPTCP_MPJ_SYNACK in subflow_finish_connect()
subflow_finish_connect() uses four fields (backup, join_id, thmac, none) that may contain garbage unless OPTION_MPTCP_MPJ_SYNACK has been set in mptcp_parse_option() Fixes: f296234 ("mptcp: Add handling of incoming MP_JOIN requests") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Florian Westphal <fw@strlen.de> Cc: Peter Krystad <peter.krystad@linux.intel.com> Cc: Matthieu Baerts <matttbe@kernel.org> Cc: Mat Martineau <martineau@kernel.org> Cc: Geliang Tang <geliang.tang@linux.dev> Reviewed-by: Simon Horman <horms@kernel.org> Acked-by: Paolo Abeni <pabeni@redhat.com> Reviewed-by: Mat Martineau <martineau@kernel.org> Link: https://lore.kernel.org/r/20240111194917.4044654-4-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent c166527 commit be1d9d9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/mptcp/subflow.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
506506
} else if (subflow->request_join) {
507507
u8 hmac[SHA256_DIGEST_SIZE];
508508

509-
if (!(mp_opt.suboptions & OPTIONS_MPTCP_MPJ)) {
509+
if (!(mp_opt.suboptions & OPTION_MPTCP_MPJ_SYNACK)) {
510510
subflow->reset_reason = MPTCP_RST_EMPTCP;
511511
goto do_reset;
512512
}

0 commit comments

Comments
 (0)