]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
mptcp: sockopt: set timestamp flags on subflow socket, not msk
authorGang Yan <yangang@kylinos.cn>
Mon, 27 Apr 2026 19:54:33 +0000 (21:54 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 29 Apr 2026 01:36:27 +0000 (18:36 -0700)
commit5f95c21fc23a7ef22b4d27d1ed9bb55557ffb926
treea83dfab44bf6e0f9bbb5008e1fec7ed8c776b170
parent21a7bb5cde5585aded53a47f21d6534d7da2ae48
mptcp: sockopt: set timestamp flags on subflow socket, not msk

Both mptcp_setsockopt_sol_socket_tstamp() and
mptcp_setsockopt_sol_socket_timestamping() iterate over subflows,
acquire the subflow socket lock, but then erroneously pass the MPTCP
msk socket to sock_set_timestamp() / sock_set_timestamping() instead
of the subflow ssk. As a result, the timestamp flags are set on the
wrong socket and have no effect on the actual subflows.

Pass ssk instead of sk to both helpers.

Fixes: 9061f24bf82e ("mptcp: sockopt: propagate timestamp request to subflows")
Cc: stable@vger.kernel.org
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260427-net-mptcp-misc-fixes-7-1-rc2-v1-1-7432b7f279fa@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/sockopt.c