[PATCH net v2 0/4] mptcp: misc fixes for v6.19-rc8

[PATCH net v2 0/4] mptcp: misc fixes for v6.19-rc8

[Matthieu Baerts (NGI0)]

Here are various unrelated fixes:

- Patch 1: when removing an MPTCP in-kernel PM endpoint, always mark the
  corresponding ID as "available". Syzbot found a corner case where it
  is not marked as such. A fix for up to v5.10.

- Patch 2: Linked to the previous patch, the variable name was confusing
  and was probably partly responsible for the issue fixed by patch 1. No
  "Fixes" tag: no need to backport that for the moment, but better to
  avoid confusion now.

- Patch 3: fix all existing kdoc warnings linked to MPTCP code. No
  "Fixes" tag: they were there for a while, and not considered as
  important to backport.

- Patch 4: silence a compiler (false-positive) warning in the selftests.
  No "Fixes" tag: it is a false-positive warning, only seen with some
  versions.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Changes in v2:
- patch 1: clarify commit message (NIPA Review assistant)
- patch 3: also modify mptcp_pm.yaml (NIPA ynl)
- Link to v1: https://patch.msgid.link/20260204-net-mptcp-misc-fixes-6-19-rc8-v1-0-cb559fb6b50a@kernel.org

---
Matthieu Baerts (NGI0) (4):
      mptcp: pm: in-kernel: always set ID as avail when rm endp
      mptcp: pm: in-kernel: clarify mptcp_pm_remove_anno_addr()
      mptcp: fix kdoc warnings
      selftests: mptcp: connect: fix maybe-uninitialize warn

 Documentation/netlink/specs/mptcp_pm.yaml         |  1 +
 include/uapi/linux/mptcp_pm.h                     |  2 +-
 net/mptcp/pm_kernel.c                             | 29 ++++++++++-------------
 net/mptcp/token.c                                 | 16 +++++++------
 tools/testing/selftests/net/mptcp/mptcp_connect.c |  2 +-
 5 files changed, 24 insertions(+), 26 deletions(-)
---
base-commit: bbf4a17ad9ffc4e3d7ec13d73ecd59dea149ed25
change-id: 20260204-net-mptcp-misc-fixes-6-19-rc8-6a66c86a12f7

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH net v2 4/4] selftests: mptcp: connect: fix maybe-uninitialize warn

[Matthieu Baerts (NGI0)]

This warning can be seen with GCC 15.2:

  mptcp_connect.c: In function ‘main_loop’:
  mptcp_connect.c:1422:37: warning: ‘peer’ may be used uninitialized [-Wmaybe-uninitialized]
   1422 |                 if (connect(fd, peer->ai_addr, peer->ai_addrlen))
        |                                 ~~~~^~~~~~~~~
  mptcp_connect.c:1377:26: note: ‘peer’ was declared here
   1377 |         struct addrinfo *peer;
        |                          ^~~~

This variable is set in sock_connect_mptcp() in some conditions. If not,
this helper returns an error, and the program stops. So this is a false
positive, but better removing it by initialising peer to NULL.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
---
 tools/testing/selftests/net/mptcp/mptcp_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 10f6f99cfd4e..24b4abac8687 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -1296,8 +1296,8 @@ void xdisconnect(int fd)
 
 int main_loop(void)
 {
+	struct addrinfo *peer = NULL;
 	int fd = 0, ret, fd_in = 0;
-	struct addrinfo *peer;
 	struct wstate winfo;
 
 	if (cfg_input && cfg_sockopt_types.mptfo) {

-- 
2.51.0

Re: [PATCH net v2 0/4] mptcp: misc fixes for v6.19-rc8

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 05 Feb 2026 18:34:20 +0100 you wrote:
> Here are various unrelated fixes:
> 
> - Patch 1: when removing an MPTCP in-kernel PM endpoint, always mark the
>   corresponding ID as "available". Syzbot found a corner case where it
>   is not marked as such. A fix for up to v5.10.
> 
> - Patch 2: Linked to the previous patch, the variable name was confusing
>   and was probably partly responsible for the issue fixed by patch 1. No
>   "Fixes" tag: no need to backport that for the moment, but better to
>   avoid confusion now.
> 
> [...]

Here is the summary with links:
  - [net,v2,1/4] mptcp: pm: in-kernel: always set ID as avail when rm endp
    https://git.kernel.org/netdev/net/c/d191101dee25
  - [net,v2,2/4] mptcp: pm: in-kernel: clarify mptcp_pm_remove_anno_addr()
    https://git.kernel.org/netdev/net/c/364a7084df9f
  - [net,v2,3/4] mptcp: fix kdoc warnings
    https://git.kernel.org/netdev/net/c/136f1e168f49
  - [net,v2,4/4] selftests: mptcp: connect: fix maybe-uninitialize warn
    https://git.kernel.org/netdev/net/c/53e553369167

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html