[v1] mptcp: fix bug in userspace PM APIs

[PATCH mptcp-next 0/3] mptcp: fix bug in userspace PM APIs

Kishen Maloor posted 3 patches 2 years ago

Diff against v2
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20220419230340.2263545-1-kishen.maloor@intel.com

Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Jakub Kicinski <kuba@kernel.org>, Mat Martineau <mathew.j.martineau@linux.intel.com>, "David S. Miller" <davem@davemloft.net>, Paolo Abeni <pabeni@redhat.com>

There is a newer version of this series

net/mptcp/pm_userspace.c | 93 +++++++++++++++++++++++-----------------
1 file changed, 53 insertions(+), 40 deletions(-)

Expand all Fold all

[PATCH mptcp-next 0/3] mptcp: fix bug in userspace PM APIs

Posted by Kishen Maloor 2 years ago

This series fixes issue #267:
https://github.com/multipath-tcp/mptcp_net-next/issues/267

Specifically, calls to mptcp_token_get_sock() from userspace PM APIs
hold a reference to the msk which needs to be freed before leaving those
functions. This was causing a memory leak which was caught in
the CI debug build.

Kishen Maloor (3):
  Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE
  Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_REMOVE
  Squash-to: mptcp: netlink: allow userspace-driven subflow
    establishment

 net/mptcp/pm_userspace.c | 93 +++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 40 deletions(-)


base-commit: e561667a821b0ecccba582520829f38da50567a3
--
2.31.1

Re: [PATCH mptcp-next 0/3] mptcp: fix bug in userspace PM APIs

Posted by Mat Martineau 2 years ago

On Tue, 19 Apr 2022, Kishen Maloor wrote:

> This series fixes issue #267:
> https://github.com/multipath-tcp/mptcp_net-next/issues/267
>
> Specifically, calls to mptcp_token_get_sock() from userspace PM APIs
> hold a reference to the msk which needs to be freed before leaving those
> functions. This was causing a memory leak which was caught in
> the CI debug build.
>
> Kishen Maloor (3):
>  Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE
>  Squash-to: mptcp: netlink: Add MPTCP_PM_CMD_REMOVE
>  Squash-to: mptcp: netlink: allow userspace-driven subflow
>    establishment
>
> net/mptcp/pm_userspace.c | 93 +++++++++++++++++++++++-----------------
> 1 file changed, 53 insertions(+), 40 deletions(-)
>
>
> base-commit: e561667a821b0ecccba582520829f38da50567a3
> --
> 2.31.1
>
>

Thanks Kishen - patches are ready to squash unless the CI surprises us.

Matthieu, I did run these in a virtme environment to confirm the leaks 
were fixed. The only remaining leak I saw was the upstream one (in 
msr_build_context()).

--
Mat Martineau
Intel