[PATCH mptcp-next 1/2] Squash to "mptcp: pm: init and release mptcp_pm_ops"

[Shardul Bankar <shardul.b@mpiricsoftware.com>]

The userspace local address list is freed from the userspace path
manager .release callback (via mptcp_pm_ops_release()), i.e. only when
the socket currently uses the userspace PM. A socket that used the
userspace PM can be reused via mptcp_disconnect() and re-selected to a
different path manager; an entry appended late would then not be freed by
the next teardown running a non-userspace PM, and leaks.

Free msk->pm.userspace_pm_local_addr_list unconditionally in
mptcp_pm_destroy() and drop the now-redundant userspace .release. The
list is initialised in the generic mptcp_pm_data_init(), so freeing it
from the generic teardown is consistent; it is empty for a kernel-PM
socket, so this is a no-op there.

Signed-off-by: Shardul Bankar <shardul.b@mpiricsoftware.com>
---
 net/mptcp/pm.c           | 6 ++++++
 net/mptcp/pm_userspace.c | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 9dc7b41fb5626..8e6d066a868d7 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -1170,6 +1170,12 @@ void mptcp_pm_destroy(struct mptcp_sock *msk)
 {
 	mptcp_pm_free_announced_list(msk);
 	mptcp_pm_ops_release(msk);
+	/* Free the userspace local address list unconditionally: the socket
+	 * can be reused (mptcp_disconnect()) and re-selected to a different
+	 * path manager, so entries queued under the userspace PM must be
+	 * reclaimed regardless of the PM in effect at teardown.
+	 */
+	mptcp_userspace_pm_free_local_addr_list(msk);
 }
 
 void mptcp_pm_data_reset(struct mptcp_sock *msk)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index ad6ba658e5a58..96fdaf12f6ddd 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -689,15 +689,9 @@ int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
 	return ret;
 }
 
-static void mptcp_pm_userspace_release(struct mptcp_sock *msk)
-{
-	mptcp_userspace_pm_free_local_addr_list(msk);
-}
-
 static struct mptcp_pm_ops mptcp_pm_userspace = {
 	.get_local_id		= mptcp_pm_userspace_get_local_id,
 	.get_priority		= mptcp_pm_userspace_get_priority,
-	.release		= mptcp_pm_userspace_release,
 	.name			= "userspace",
 	.owner			= THIS_MODULE,
 };
-- 
2.34.1