Commit 5f95c21f authored by Gang Yan's avatar Gang Yan Committed by Jakub Kicinski
Browse files

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: 9061f24b ("mptcp: sockopt: propagate timestamp request to subflows")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGang Yan <yangang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
parent 21a7bb5c

net/mptcp/sockopt.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int mptcp_setsockopt_sol_socket_tstamp(struct mptcp_sock *msk, int optnam 
		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		bool slow = lock_sock_fast(ssk);



		sock_set_timestamp(sk, optname, !!val);

		sock_set_timestamp(ssk, optname, !!val);

		unlock_sock_fast(ssk, slow);

	}
@@ -237,7 +237,7 @@ static int mptcp_setsockopt_sol_socket_timestamping(struct mptcp_sock *msk, 
		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		bool slow = lock_sock_fast(ssk);



		sock_set_timestamping(sk, optname, timestamping);

		sock_set_timestamping(ssk, optname, timestamping);

		unlock_sock_fast(ssk, slow);

	}