From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3471A4AAC55 for ; Wed, 16 Sep 2026 16:42:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789576941; cv=none; b=sZ6f7l7h1XgARr/Zoow/zRymRyHKCw+HK611qJ3VShe1GOd7f5vbe7tahZomgXjV0Jy1+IsDI7O7p/Bg2DX3LIaPTOItGCOWjAoQNlB6g/SCF5UO/T0wtlHhBzdx62m3suSeU2dTcSlG87AW6ucE/DWc0+LRcd/6KgDfo+f+dZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789576941; c=relaxed/simple; bh=KgMjnd+ZQdHztDLX8cmh0ukWrBLK5BVhQujM0rp4/QE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=pCfWk9WOwatUZB2oGqa9dAZ1YgfxmXOGB16CTeSz8gz+qMUnEzsLPCZO+Yct5GZL688kECOZLHMg1hza7f8PBM7ua4+2vP00RG9r9KCae64zQr97pXbSao/psWrW0YubsfIX9SdO/Qu21wPiHuopawvMDoJPBCLZ6xC0vA4a6CQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RksxEwbx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RksxEwbx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CC351F0089C; Wed, 16 Sep 2026 16:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789576929; bh=caNBEbP3+wFKKBMY/R9qlKsHRKqJhhzU7yR6ToSpz24=; h=Subject:To:Cc:From:Date; b=RksxEwbxiXBPIo4IyhPPBVSkhaEYcUNamLECxhNZZjqOqJ0oGN8BshMTc4dYcsfPT 6O8msjXCmFKWKyqz6JZZFjtoyzzkCbJJ0D75COLx1diIgi0uh/CfB0UVQZAfBswrfS 612aRlwyUgx49o7e21nTtW+lB7xkinEkp+EP5VI0= Subject: FAILED: patch "[PATCH] mptcp: prevent race between disconnect() and rtx" failed to apply to 6.1-stable tree To: pabeni@redhat.com,kuba@kernel.org,matttbe@kernel.org Cc: From: Date: Wed, 16 Sep 2026 17:34:22 +0100 Message-ID: <2026091622-thieving-raffle-4915@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 85c580b0d8590520ae00a15c29e9fb9c99427a3e # git commit -s git send-email --to '' --in-reply-to '2026091622-thieving-raffle-4915@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 85c580b0d8590520ae00a15c29e9fb9c99427a3e Mon Sep 17 00:00:00 2001 From: Paolo Abeni Date: Tue, 8 Sep 2026 16:07:11 +0200 Subject: [PATCH] mptcp: prevent race between disconnect() and rtx Sashiko noted that the two event can race, leading to inconsistent status. Prevent the race using the synchronous timer stop operation. Cc: stable@vger.kernel.org Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation") Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-6-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index be59651e708e..d611af2eb74f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3588,6 +3588,7 @@ static void mptcp_destroy_common(struct mptcp_sock *msk) static int mptcp_disconnect(struct sock *sk, int flags) { + struct inet_connection_sock *icsk = inet_csk(sk); struct mptcp_sock *msk = mptcp_sk(sk); /* We are on the fastopen error path. We can't call straight into the @@ -3600,8 +3601,13 @@ static int mptcp_disconnect(struct sock *sk, int flags) mptcp_check_listen_stop(sk); mptcp_set_state(sk, TCP_CLOSE); - mptcp_stop_rtx_timer(sk); - mptcp_stop_tout_timer(sk); + /* The later subflow close can not kick again the tout timer, + * as the msk is already in closed status. + */ + msk->timer_ival = icsk->icsk_rto_min; + sk_stop_timer_sync(sk, &sk->mptcp_retransmit_timer); + icsk->icsk_mtup.probe_timestamp = 0; + sk_stop_timer_sync(sk, &icsk->mptcp_tout_timer); mptcp_pm_connection_closed(msk);