mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID
commit 6a09788c upstream. The RmAddr MIB counter is supposed to be incremented once when a valid RM_ADDR has been received. Before this patch, it could have been incremented as many times as the number of subflows connected to the linked address ID, so it could have been 0, 1 or more than 1. The "RmSubflow" is incremented after a local operation. In this case, it is normal to tied it with the number of subflows that have been actually removed. The "remove invalid addresses" MP Join subtest has been modified to validate this case. A broadcast IP address is now used instead: the client will not be able to create a subflow to this address. The consequence is that when receiving the RM_ADDR with the ID attached to this broadcast IP address, no subflow linked to this ID will be found. Fixes: 7a7e52e3 ("mptcp: add RM_ADDR related mibs") Cc: stable@vger.kernel.org Co-developed-by:Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by:
YonglongLi <liyonglong@chinatelecom.cn> Signed-off-by:
Jakub Kicinski <kuba@kernel.org> [ Conflicts in pm_netlink.c because the context has changed later in multiple commits linked to new features, e.g. commit 86e39e04 ("mptcp: keep track of local endpoint still available for each msk"), commit a88c9e49 ("mptcp: do not block subflows creation on errors") and commit 3ad14f54 ("mptcp: more accurate MPC endpoint tracking"), but the independent lines that needed to be modified were still there. Conflicts in the selftests, because many features modifying the whole file have been added later, e.g. commit ae7bd9cc ("selftests: mptcp: join: option to execute specific tests"). The same modifications have been reported to the old code: simply changing the IP address and add a new comment. ] Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Loading