]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'mptcp-pm-fix-wrong-perm-and-sock-kfree'
authorJakub Kicinski <kuba@kernel.org>
Wed, 6 Nov 2024 01:51:10 +0000 (17:51 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 6 Nov 2024 01:51:11 +0000 (17:51 -0800)
Matthieu Baerts says:

====================
mptcp: pm: fix wrong perm and sock kfree

Two small fixes related to the MPTCP path-manager:

- Patch 1: remove an accidental restriction to admin users to list MPTCP
  endpoints. A regression from v6.7.

- Patch 2: correctly use sock_kfree_s() instead of kfree() in the
  userspace PM. A fix for another fix introduced in v6.4 and
  backportable up to v5.19.
====================

Link: https://patch.msgid.link/20241104-net-mptcp-misc-6-12-v1-0-c13f2ff1656f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge