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 36D9517332C; Tue, 26 Aug 2025 11:41:45 +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=1756208506; cv=none; b=T76lcAVII9dhzhFdOboWXlwl0A+wKjmQSCH9CgEbfkO5UPQ/MplIM4POOHd7L/UGMZMBDRJ4tDemL09ZTv2a+j5y8NuSXmOL9wrlkJmxKs4mNWZcWT99Hcw8TwMaVMsCQyWLgeDr48evg3LsXjEwohoxxX+deBuvU22qnMJC4D4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756208506; c=relaxed/simple; bh=+O3sSZvSCaK4gNRGps5hwNG8He4zhvYuyZXDzXXQess=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DqOB+dgoitvUYPKCm0Ad63YleLALGRs9PmKuQOz2De1dlnuNUI9vaIQsjr7TYkOyLZGE+Gpjg4KdmfgvsZ4kk255kMTN9+AJBtcrYjQzivc1BY/lkrv1BxuyitoGJo4mlM6NCeFKxmKWpSPHCLVL7iWNBELPZlEnwwk1ZPt/NQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ltn0cK6c; 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="ltn0cK6c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68C47C4CEF1; Tue, 26 Aug 2025 11:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756208505; bh=+O3sSZvSCaK4gNRGps5hwNG8He4zhvYuyZXDzXXQess=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ltn0cK6cV1fkYJ/Pe1A/feXkuNC3sqL594uMhMJrybkdD1POTggErEmDoB/AMk+Sk N9Pg712Sxg5opeaXKb1KkbVLkvdlIlbnO0AgCKKiIRMg+P5nph9KZOd33UnSNG6g12 CjXwuAYeXoZPfKvy3+IR7AUwlJVMHkqoVAL2RnBI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Dreibholz , Mat Martineau , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.12 136/322] mptcp: pm: kernel: flush: do not reset ADD_ADDR limit Date: Tue, 26 Aug 2025 13:09:11 +0200 Message-ID: <20250826110919.161727867@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110915.169062587@linuxfoundation.org> References: <20250826110915.169062587@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthieu Baerts (NGI0) commit 68fc0f4b0d25692940cdc85c68e366cae63e1757 upstream. A flush of the MPTCP endpoints should not affect the MPTCP limits. In other words, 'ip mptcp endpoint flush' should not change 'ip mptcp limits'. But it was the case: the MPTCP_PM_ATTR_RCV_ADD_ADDRS (add_addr_accepted) limit was reset by accident. Removing the reset of this counter during a flush fixes this issue. Fixes: 01cacb00b35c ("mptcp: add netlink-based PM") Cc: stable@vger.kernel.org Reported-by: Thomas Dreibholz Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/579 Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-2-521fe9957892@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/pm_netlink.c | 1 - 1 file changed, 1 deletion(-) --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1737,7 +1737,6 @@ static void __flush_addrs(struct list_he static void __reset_counters(struct pm_nl_pernet *pernet) { WRITE_ONCE(pernet->add_addr_signal_max, 0); - WRITE_ONCE(pernet->add_addr_accept_max, 0); WRITE_ONCE(pernet->local_addr_max, 0); pernet->addrs = 0; }