Skip to content

Commit

Permalink
mptcp: remove all subflows involving id 0 address
Browse files Browse the repository at this point in the history
There's only one subflow involving the non-zero id address, but there
may be multi subflows involving the id 0 address.

Here's an example:

 local_id=0, remote_id=0
 local_id=1, remote_id=0
 local_id=0, remote_id=1

If the removing address id is 0, all the subflows involving the id 0
address need to be removed.

In mptcp_pm_nl_rm_addr_received/mptcp_pm_nl_rm_subflow_received, the
"break" prevents the iteration to the next subflow, so this patch
dropped them.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Geliang Tang authored and David S. Miller committed Mar 31, 2021
1 parent b812865 commit 774c8a8
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions net/mptcp/pm_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,6 @@ static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)
WRITE_ONCE(msk->pm.accept_addr, true);

__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMADDR);

break;
}
}
}
Expand Down Expand Up @@ -695,8 +693,6 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk,
msk->pm.subflows--;

__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW);

break;
}
}
}
Expand Down

0 comments on commit 774c8a8

Please sign in to comment.