mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 12:37:32 +00:00
Code Issues Releases Wiki Activity

mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other

Browse source 
ADD_ADDR shares pm.addr_signal with RM_ADDR, so after RM_ADDR/ADD_ADDR
has done, we should not clean ADD_ADDR/RM_ADDR's addr_signal.

Co-developed-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yonglong Li 2021-08-23 18:05:41 -07:00 committed by David S. Miller
parent 18fc1a922e
commit 119c022096
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/mptcp/pm.c
View file

@ -261,6 +261,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
bool *port, bool *drop_other_suboptions) bool *port, bool *drop_other_suboptions)
{ {
int ret = false; int ret = false;
u8 add_addr;
spin_lock_bh(&msk->pm.lock); spin_lock_bh(&msk->pm.lock);
@ -284,7 +285,11 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
goto out_unlock; goto out_unlock;
*saddr = msk->pm.local; *saddr = msk->pm.local;
WRITE_ONCE(msk->pm.addr_signal, 0); if (*echo)
add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO);
else
add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_SIGNAL);
WRITE_ONCE(msk->pm.addr_signal, add_addr);
ret = true; ret = true;
out_unlock: out_unlock:
@ -296,6 +301,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
struct mptcp_rm_list *rm_list) struct mptcp_rm_list *rm_list)
{ {
int ret = false, len; int ret = false, len;
u8 rm_addr;
spin_lock_bh(&msk->pm.lock); spin_lock_bh(&msk->pm.lock);
@ -303,16 +309,17 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
if (!mptcp_pm_should_rm_signal(msk)) if (!mptcp_pm_should_rm_signal(msk))
goto out_unlock; goto out_unlock;
rm_addr = msk->pm.addr_signal & ~BIT(MPTCP_RM_ADDR_SIGNAL);
len = mptcp_rm_addr_len(&msk->pm.rm_list_tx); len = mptcp_rm_addr_len(&msk->pm.rm_list_tx);
if (len < 0) { if (len < 0) {
WRITE_ONCE(msk->pm.addr_signal, 0); WRITE_ONCE(msk->pm.addr_signal, rm_addr);
goto out_unlock; goto out_unlock;
} }
if (remaining < len) if (remaining < len)
goto out_unlock; goto out_unlock;
*rm_list = msk->pm.rm_list_tx; *rm_list = msk->pm.rm_list_tx;
WRITE_ONCE(msk->pm.addr_signal, 0); WRITE_ONCE(msk->pm.addr_signal, rm_addr);
ret = true; ret = true;
out_unlock: out_unlock: