Skip to content

Commit f7d953c

Browse files
Dwyane-Yangregkh
authored andcommitted
mptcp: fix address removal logic in mptcp_pm_nl_rm_addr
[ Upstream commit 92e239e36d600002559074994a545fcfac9afd2d ] Fix inverted WARN_ON_ONCE condition that prevented normal address removal counter updates. The current code only executes decrement logic when the counter is already 0 (abnormal state), while normal removals (counter > 0) are ignored. Signed-off-by: Gang Yan <[email protected]> Fixes: 6361139 ("mptcp: pm: remove '_nl' from mptcp_pm_nl_rm_addr_received") Cc: [email protected] Reviewed-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20251118-net-mptcp-misc-fixes-6-18-rc6-v1-10-806d3781c95f@kernel.org Signed-off-by: Jakub Kicinski <[email protected]> [ Context ] Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 81a8685 commit f7d953c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/mptcp/pm_kernel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
548548

549549
void mptcp_pm_nl_rm_addr(struct mptcp_sock *msk, u8 rm_id)
550550
{
551-
if (rm_id && WARN_ON_ONCE(msk->pm.add_addr_accepted == 0)) {
551+
if (rm_id && !WARN_ON_ONCE(msk->pm.add_addr_accepted == 0)) {
552552
/* Note: if the subflow has been closed before, this
553553
* add_addr_accepted counter will not be decremented.
554554
*/

0 commit comments

Comments
 (0)