Unverified Commit 9d5b8fe1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11949 mptcp: pm: only decrement add_addr_accepted for MPJ req 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/A3P7MOFOA4QQJLSB67HYBQ52HDP5UPL2/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAQOJM 
 
Link:https://gitee.com/openeuler/kernel/pulls/11949

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 83aa19dc 39c5128d

net/mptcp/pm_netlink.c

+6 −2
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
			mptcp_close_ssk(sk, ssk, subflow);

			spin_lock_bh(&msk->pm.lock);



			removed = true;

			removed |= subflow->request_join;

			if (rm_type == MPTCP_MIB_RMSUBFLOW)

				__MPTCP_INC_STATS(sock_net(sk), rm_type);

		}
@@ -855,7 +855,11 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
		if (!mptcp_pm_is_kernel(msk))

			continue;



		if (rm_type == MPTCP_MIB_RMADDR) {

		if (rm_type == MPTCP_MIB_RMADDR && rm_id &&

		    !WARN_ON_ONCE(msk->pm.add_addr_accepted == 0)) {

			/* Note: if the subflow has been closed before, this

			 * add_addr_accepted counter will not be decremented.

			 */

			msk->pm.add_addr_accepted--;

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

		} else if (rm_type == MPTCP_MIB_RMSUBFLOW) {