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 9D80B320CAD; Sat, 30 May 2026 17:55:41 +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=1780163742; cv=none; b=iZOWR8Ml8B5WZ/2oolih/Zhtt+/NYzLzQYwy1guG/E4M0oQTsZ0TTaSGHm57seHJbyqAMoIEJA/qulkyoI5fyEqN7t8xxOpsiBygOnO2gXMweLapJ8DqwzztIB7NiW0dABcLsI0cajgwRonPodOUJf0/MUXI4iXTXyWMmxLsBXk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163742; c=relaxed/simple; bh=Tv8VtlDFIHrJgJ3GLkp9W1CLdFRwvzC7PoSaCEPLDIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XCLlddplO8mbGSEt7H1p2yFJX26tMx0RRD65e2C+NTnbaAosQ3n1zdtF7tyrBcfRvF06UfkifUUtxaNbEDRh4HqkCLuWv561J9FJTaBpdOJu1H3TpRkM10ZDbIPX8fV8ZcDg0F6KByd7e8Jv2xAck/0Y5lsbVfF2eF4wJFOwu3Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W9U/bNxH; 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="W9U/bNxH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1BB61F00893; Sat, 30 May 2026 17:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780163741; bh=XYV56CxnwjXEdVrAq/kJ+tfT++b/jyr2OJxDhrUfHSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W9U/bNxHYzmRB4pAKxDbF6+6ZrtzVYCnYnwywwaABaMDbeK4YMvZa/rmWKW3caFqM FaPH1Khk+esgOw+O+dSfxvQkZPMlxXxBkol9E+xwi7uGZdEgvb2MerPVIVruWG7a3z +cJwyQ98xqhR8wkO8WYdRIdXmtCbIS5sWgoFxjbY= 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 5.15 348/776] mptcp: sockopt: set timestamp flags on subflow socket, not msk Date: Sat, 30 May 2026 18:01:02 +0200 Message-ID: <20260530160249.572894108@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@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 5.15-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 @@ -157,7 +157,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); } @@ -233,7 +233,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); }