Commit b662fd06 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by ZhangPeng
Browse files

mptcp: pm: only set request_bkup flag when sending MP_PRIO 

stable inclusion
from stable-v6.6.45
commit bd1d1fc4bc613353b28ccdb1223ab3f17b0e3bfd
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

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



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

commit 4258b94831bb7ff28ab80e3c8d94db37db930728 upstream.

The 'backup' flag from mptcp_subflow_context structure is supposed to be
set only when the other peer flagged a subflow as backup, not the
opposite.

Fixes: 06706542 ("mptcp: add the outgoing MP_PRIO support")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 0d4d7937

net/mptcp/pm_netlink.c

+0 −1
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ static void __mptcp_pm_send_ack(struct mptcp_sock *msk, struct mptcp_subflow_con 
	slow = lock_sock_fast(ssk);

	if (prio) {

		subflow->send_mp_prio = 1;

		subflow->backup = backup;

		subflow->request_bkup = backup;

	}