From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C4BBA271472 for ; Fri, 22 Aug 2025 06:04:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755842684; cv=none; b=p8bM1LDBQSb1zRSrgcg19rR5EXeK4Rs6LFnD5GKGrCjkGz7C4iZLZHNPY1Z9p9HQgMsBdlQHhHaSv5kudElxsutVfQANbWfTJPdVh/aPsWXc/yOpUCwAaaIZy3jHwL7lBwnXBTa+vCfDW2Oyf4Kodzr5xp+DYcitQDXbECJMoaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755842684; c=relaxed/simple; bh=OMU7qmY5wQpUlkpByVxitBMQ5kCZDpyeKU/+mqf6KH0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=MdlGWs0PSkCiDpf7+GwrPrjjV725pfKTdLX6dhUhLFDRK+5/swFB8IRs5yMRYWyCngLhJHeQhoQOZmB1wM5t2uWjhJ84JmuP8/Eh5B+5VqPIQdF3IMf/IB+QOrLlt/ARPXIrPN6futvgzZOaQZfjLc6zCTYwI+JXHLAVXc56E2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mvB4FpJM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mvB4FpJM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E20EDC4CEF4; Fri, 22 Aug 2025 06:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755842684; bh=OMU7qmY5wQpUlkpByVxitBMQ5kCZDpyeKU/+mqf6KH0=; h=Subject:To:Cc:From:Date:From; b=mvB4FpJMJHaeRjRqM4BuT+8WDztZyK+pCqi8xUgzUpKnpyg0OORuIceuj9tTWXhN5 OuiJaAnieWZOWtm3dla1aczBmeno8COwz03HNO3vehA0KgTfGY8GNDPjW1L/x0Xgpm 5/JdrNTDaxuvYctVCPjFdYz14w3WUcUlspOz2w1A= Subject: FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 5.15-stable tree To: geliang@kernel.org,kuba@kernel.org,matttbe@kernel.org,tanggeliang@kylinos.cn Cc: From: Date: Fri, 22 Aug 2025 08:04:30 +0200 Message-ID: <2025082230-dupe-going-e673@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 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 5d13349472ac8abcbcb94407969aa0fdc2e1f1be # git commit -s git send-email --to '' --in-reply-to '2025082230-dupe-going-e673@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001 From: Geliang Tang Date: Fri, 15 Aug 2025 19:28:22 +0200 Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list. Simplify the code by using a 'goto' statement to eliminate the duplication. Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason. Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout") Cc: stable@vger.kernel.org Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 420d416e2603..c5f6a53ce5f1 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -353,9 +353,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk))) return false; - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); - return true; + goto reset_timer; } add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC); @@ -369,6 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times = 0; timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); +reset_timer: sk_reset_timer(sk, &add_entry->add_timer, jiffies + mptcp_get_add_addr_timeout(net));