From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C03472690D5; Sat, 30 May 2026 17:04:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160677; cv=none; b=IeVFaJCUMFj44huGGn8F6ArahvSWz74tlu8VCrj/mUiNEqulMvKdrEB3t4QzS4Bcsr2n4QlO4S1DEZGbCEdm+FcovO0X9TgAJft3PjEVXvxiGQSZhDlzopbbdNwb8ijpBQQbqbVKTpOL4LfgPHgJf1jJlQ+UCOZwvoD6PvsxzKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160677; c=relaxed/simple; bh=hQZs4XCTYQcFZCSVR83u8Wvr8SJ53WchQddkCed3I5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G3EhF5yegpzjra/1D94MHJ/3JuXe3trb09I/wR7JX5Q3tGzKp6oHEDeO3VRmw8zYlJW5LcOE75XS4F2xqyk3G42LplrgNceajWdtRL1FXgzUjtumzV1Rjny6pETgt7rHAtjdVcFRspQpdEwfrjFD64sFP/zTT7Ekn2tM6jpYKJk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cuSRQoFJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cuSRQoFJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 118021F00898; Sat, 30 May 2026 17:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160676; bh=ZbV+9wXIrsHefJBkIDarSJpVtifiZrVGTvEz5aVpnRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cuSRQoFJn6bmBpEq9nVPYqBQM29U2LdThgaIkZCCdJuEOijbYqhoMNQ+kr53OW/3M ZnhcndHQLvJa1LgCjFG+Gw7IqS4G39malG0bBYiB4WPFoJa6r6xthBAOSqnTVQoZ7X GvhlL33u9Bz21hUxdY1o2F12G+iq9uY+vJhiLubI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gang Yan , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.1 373/969] mptcp: sockopt: set timestamp flags on subflow socket, not msk Date: Sat, 30 May 2026 17:58:17 +0200 Message-ID: <20260530160310.613419377@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gang Yan commit 5f95c21fc23a7ef22b4d27d1ed9bb55557ffb926 upstream. 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 Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260427-net-mptcp-misc-fixes-7-1-rc2-v1-1-7432b7f279fa@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/sockopt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -159,7 +159,7 @@ static int mptcp_setsockopt_sol_socket_t 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); } @@ -235,7 +235,7 @@ static int mptcp_setsockopt_sol_socket_t 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); }