mptcp: fix uninitialized local_id in syncookie MP_JOIN reconstruction
Subsystems (4)
PATCH 1/1 mptcp: fix uninitialized local_id in syncookie MP_JOIN reconstruction
mptcp_token_join_cookie_init_state() restores remote_nonce, local_nonce, backup, join_id, token and msk from the saved cookie entry when rebuilding the request socket for a MP_JOIN 4th-ACK handled under SYN cookies, but it does not restore local_id, even though the SYN path saved it. subflow_ulp_clone() then reads that uninitialized field and stores it as the joined subflow's address-ID. Because the request-sock slab is SLAB_TYPESAFE_BY_RCU and not zeroed on allocation, the value is the stale byte of a previously freed request socket, which an off-path peer can influence by sending concurrent MP_JOIN SYNs. This corrupts the path manager's id-based subflow bookkeeping for the connection.
Restore subflow_req->local_id from the cookie entry, as done for the other fields.
--- net/mptcp/syncookies.c | 1 + 1 file changed, 1 insertion(+)
net/mptcp/syncookies.c +1 -0
@@ -118,6 +118,7 @@ bool mptcp_token_join_cookie_init_state(struct mptcp_subflow_request_sock *subfl subflow_req->local_nonce = e->local_nonce; subflow_req->backup = e->backup; subflow_req->remote_id = e->join_id; + subflow_req->local_id = e->local_id; subflow_req->token = e->token; subflow_req->msk = msk;spin_unlock_bh (&join_entry_locks[i]);
Signature · 1 line
2.53.0
Hi Harshit,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal (except selftest_mptcp_join): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Success! ✅
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/31884229084
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/6ac3c6cc38ea
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1146490
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] The request_bkup bitfield in mptcp_subflow_request_sock is left uninitialized during syncookie MP_JOIN reconstruction, causing stale data to dictate the subflow backup state. --
--- Patch [1]: [PATCH net] mptcp: fix uninitialized local_id in syncookie MP_JOIN reconstruction --- commit ac471f0880c8ac59556dc5bd33e8a83b1849726c
Author: Harshit Varu <[email protected]>
mptcp: fix uninitialized local_id in syncookie MP_JOIN reconstruction
This commit restores the local_id field from the saved cookie entry when rebuilding the request socket for an MP_JOIN 4th-ACK handled under SYN cookies. This prevents the subflow from using stale slab memory as its address-ID, protecting the path manager's bookkeeping.
net/mptcp/syncookies.c bool mptcp_token_join_cookie_init_state(struct mptcp_subflow_request_sock *subfl · line 121
Quoted 9 lines
net/mptcp/syncookies.c +1
-0@@ -118,6 +118,7 @@ bool mptcp_token_join_cookie_init_state(struct mptcp_subflow_request_sock *subfl subflow_req->local_nonce = e->local_nonce; subflow_req->backup = e->backup; subflow_req->remote_id = e->join_id; + subflow_req->local_id = e->local_id;
[Severity: High]
This is a pre-existing issue, but does this code also leave the request_bkup bitfield uninitialized during syncookie reconstruction?
While this commit fixes local_id, the request_bkup bitfield in mptcp_subflow_request_sock doesn't appear to be saved in mptcp_join_store_state() or restored here.
Since the request_sock slab is SLAB_TYPESAFE_BY_RCU and memory isn't zeroed on allocation, subflow_init_req() zeroes some adjacent bitfields but misses request_bkup:
net/mptcp/subflow.c:subflow_init_req() {
...
subflow_req->mp_capable = 0;
subflow_req->mp_join = 0;
subflow_req->csum_reqd = mptcp_is_checksum_enabled(sock_net(sk_listener));
...
}When the final subflow context is cloned, it copies this uninitialized state directly from the request socket:
net/mptcp/subflow.c:subflow_ulp_clone() {
...
new_ctx->backup = subflow_req->backup;
new_ctx->request_bkup = subflow_req->request_bkup;
...
}Could this stale memory cause the MPTCP stack to erroneously treat primary paths as backup paths (or vice versa)?
Quoted 3 lines
net/mptcp/syncookies.c +0
-0subflow_req->token = e->token; subflow_req->msk = msk;spin_unlock_bh (&join_entry_locks[i]);
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Hi Harshit,
Quoted 10 lines · Harshit Varu
mptcp_token_join_cookie_init_state()restoresremote_nonce,local_nonce, backup,join_id, token and msk from the saved cookie entry when rebuilding the request socket for aMP_JOIN4th-ACK handled under SYN cookies, but it does not restorelocal_id, even though the SYN path saved it.subflow_ulp_clone()then reads that uninitialized field and stores it as the joined subflow's address-ID. Because the request-sock slab isSLAB_TYPESAFE_BY_RCUand not zeroed on allocation, the value is the stale byte of a previously freed request socket, which an off-path peer can influence by sending concurrentMP_JOINSYNs. This corrupts the path manager's id-based subflow bookkeeping for the connection.
Thank you for this new version:
Please next time add all the reviewers in cc -- as requested in your v2 -- and add the version number in the prefix. No need to send a new version to address that.
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Sat, 15 Aug 2026 17:22:05 +0530 you wrote:
mptcp_token_join_cookie_init_state()restoresremote_nonce,local_nonce, backup,join_id, token and msk from the saved cookie entry when rebuilding the request socket for aMP_JOIN4th-ACK handled under SYN cookies, but it does not restorelocal_id, even though the SYN path saved it.subflow_ulp_clone()then reads that uninitialized field and stores it as the joined subflow's address-ID. Because the request-sock slab isSLAB_TYPESAFE_BY_RCUand not zeroed on allocation, the value is the stale byte of a previously freed request socket, which an off-path peer can influence by sending concurrentMP_JOINSYNs. This corrupts the path manager's id-based subflow bookkeeping for the connection.
Quoted 1 line
[...]
Here is the summary with links:
- [net] mptcp: fix uninitialized local_id in syncookie MP_JOIN reconstruction
https://git.kernel.org/netdev/net/c/b878dfdd12d7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html