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 F37CB3C0628; Tue, 16 Jun 2026 16:02:23 +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=1781625744; cv=none; b=VSiXYFqHPSKG0kP7+2VQb+MN6VJtBqFPhrXRfHBKxGlQQCkvbvA3ZU51OgQFdnrIpZQD3U7noifY7w9NjAEy563SH22XUdyb30VaaDmbJ5b4ZMGXCircDWLT/iq8593i1Uvmg1+Fa2fSAw4254ZiERDLOMWzIRyUaBlnW1ftn54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625744; c=relaxed/simple; bh=hbIkY1uNDDewiAZvBnyr/Q0oRY381Z+7pKrit9DnDWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l1FtmZyk4WT5RzLgQ0U8QrEWQAh4nJdXfe1swDI2Zav7jHQnhU+yPQcEOhNMym9J1xzFL+0/+w6LBsuEmyFpSa6H7o8UXvimtoldYydaWvTEKvwSpeo7vBC7eimbOIfe0gjL3JZkyli3HXfkJTPtcx7EVpY4+esMVHL8ybUY+0s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nkf6PE3v; 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="nkf6PE3v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0032B1F000E9; Tue, 16 Jun 2026 16:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781625743; bh=LORu9xOIvM7ynjbSArjs/Yu7LjopxDt+6gGI5IHzJuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nkf6PE3vIE/Aqc2Nf4NjP5CISPc8NRqaR3oe+kZhNfW4GiVVntkFtzJurusHTFD4r fqk+Di3kxARc/AW2YGz+OfZs58EKyZh/f0eT0bvI9p901RWSAlFVxf8Ev9GankDcBu UY8qHz7srDhEWcSXDRTHeFBvJbrpvSkpzcbyWJno= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Willem de Bruijn , Mat Martineau , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.18 199/325] mptcp: sockopt: check timestamping ret value Date: Tue, 16 Jun 2026 20:29:55 +0530 Message-ID: <20260616145107.906929987@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthieu Baerts (NGI0) commit 57132affbc89c02e1bf73fdf5724311bdc9a29da upstream. sock_set_timestamping() can fail for different reasons. The returned value should then be checked. If sock_set_timestamping() fails for at least one subflow, the first error is now reported to the userspace, similar to what is done with other socket options. Fixes: 9061f24bf82e ("mptcp: sockopt: propagate timestamp request to subflows") Cc: stable@vger.kernel.org Reported-by: Willem de Bruijn Closes: https://lore.kernel.org/willemdebruijn.kernel.178a41a53d041@gmail.com Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260602-net-mptcp-misc-fixes-7-1-rc7-v2-7-856831229976@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/mptcp/sockopt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -235,15 +235,19 @@ static int mptcp_setsockopt_sol_socket_t mptcp_for_each_subflow(msk, subflow) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); + int err; lock_sock(ssk); - sock_set_timestamping(ssk, optname, timestamping); + err = sock_set_timestamping(ssk, optname, timestamping); release_sock(ssk); + + if (err < 0 && ret == 0) + ret = err; } release_sock(sk); - return 0; + return ret; } static int mptcp_setsockopt_sol_socket_linger(struct mptcp_sock *msk, sockptr_t optval,