Commit a0549f91 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Wen Zhiwei
Browse files

mptcp: pm: check add_addr_accept_max before accepting new ADD_ADDR 

stable inclusion
from stable-v6.6.48
commit 9907af6a28a67fbc42684b743e6b84e78903ef95
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWEBV

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9907af6a28a67fbc42684b743e6b84e78903ef95



--------------------------------

commit 0137a3c7c2ea3f9df8ebfc65d78b4ba712a187bb upstream.

The limits might have changed in between, it is best to check them
before accepting new ADD_ADDR.

Fixes: d0876b22 ("mptcp: add the incoming RM_ADDR support")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240819-net-mptcp-pm-reusing-id-v1-10-38035d40de5b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 88579a61

net/mptcp/pm_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
			/* Note: if the subflow has been closed before, this

			 * add_addr_accepted counter will not be decremented.

			 */

			msk->pm.add_addr_accepted--;

			if (--msk->pm.add_addr_accepted < mptcp_pm_get_add_addr_accept_max(msk))

				WRITE_ONCE(msk->pm.accept_addr, true);

		}

	}