]> www.infradead.org Git - users/willy/xarray.git/commit
mptcp: pm: only decrement add_addr_accepted for MPJ req
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Mon, 19 Aug 2024 19:45:27 +0000 (21:45 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 Aug 2024 00:40:13 +0000 (17:40 -0700)
commit1c1f721375989579e46741f59523e39ec9b2a9bd
tree2444bbe7fab7abad9a47801f61a7f6bc69cb65f4
parent322ea3778965da72862cca2a0c50253aacf65fe6
mptcp: pm: only decrement add_addr_accepted for MPJ req

Adding the following warning ...

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

... before decrementing the add_addr_accepted counter helped to find a
bug when running the "remove single subflow" subtest from the
mptcp_join.sh selftest.

Removing a 'subflow' endpoint will first trigger a RM_ADDR, then the
subflow closure. Before this patch, and upon the reception of the
RM_ADDR, the other peer will then try to decrement this
add_addr_accepted. That's not correct because the attached subflows have
not been created upon the reception of an ADD_ADDR.

A way to solve that is to decrement the counter only if the attached
subflow was an MP_JOIN to a remote id that was not 0, and initiated by
the host receiving the RM_ADDR.

Fixes: d0876b2284cf ("mptcp: add the incoming RM_ADDR support")
Cc: stable@vger.kernel.org
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240819-net-mptcp-pm-reusing-id-v1-9-38035d40de5b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/pm_netlink.c