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 CB90837C906; Sat, 12 Sep 2026 12:45:20 +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=1789217122; cv=none; b=iOkP/hrwV4RO3xBbn1RfbyMQ1W5bSzHt63x8DmjqMvuakYc9LzjG087C0MJzI4TZfrigCaYEyg1N+n40nBKHZnUnvDEAyzlHyWb1sOs7mnheoG6ZlH9EduspSbQIVwgfnxnTplr9Qx/D1SBojXHpOWbR+yFzyoepPr0FkUuvZQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789217122; c=relaxed/simple; bh=iL5QhyHol4GfcNvNVjn7+CfNDktisDr8S++H1y110iA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UeNFofyytXgGTHnYhZBj5Ly0JAM+K9zkOPpL/XnSicd0Dwi6C+kiqJ2e4IdeeJ4wmkMUnJQuaIZIOceo82uAgCB+IfQpnR0khFBlAtySsjpnng39TkBj5wuTUT/zNRfDh+JMiiw8fqNp6lkkHtYKElvv3EBU4SSAbfx51fshrLM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gfewof5S; 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="gfewof5S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98CFB1F000FF; Sat, 12 Sep 2026 12:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789217120; bh=CVcZ0dpkH19eMT0EC5Xfuem0Pl81JWUMViUys3rFcx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gfewof5SKRGuGOoJVX4Bfr8/KtzkY1UatAZ3U7/UcZUSLtv9yLr/LbeBbUQMXdele utr8JnAQxBea2jBcbeMm72IuEl/dyxUfmSYGaO2G3Ea1D5hCdWYilEzthGiQD6gEmq M397J0SJhSrF3UBSyug5Bwhq2ZJgdH13HyNDTpx8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= , Joe Damato , Stanislav Fomichev , Breno Leitao , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 0874/1376] phonet: pep: do not write beyond optlen in getsockopt Date: Sat, 12 Sep 2026 08:55:00 +0200 Message-ID: <20260912065627.036843868@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Breno Leitao [ Upstream commit 77e5eb0e192aec6710c03ca8144582fd2af36ca4 ] pep_getsockopt() clamps the reported length to the caller's buffer with min_t(), but then stores the value with put_user(val, (int __user *) optval), which always writes sizeof(int) bytes. A getsockopt() call with an optlen smaller than sizeof(int) thus reports the clamped length yet writes a full int, one to three bytes past the user buffer. Write the value with copy_to_user() bounded by len, so at most optlen bytes are copied, matching the length reported back to userspace. Fixes: 02a47617cdce ("Phonet: implement GPRS virtual interface over PEP socket") Acked-by: Rémi Denis-Courmont Reviewed-by: Joe Damato Acked-by: Stanislav Fomichev Signed-off-by: Breno Leitao Link: https://patch.msgid.link/20260729-getsockopt_phase4-v4-4-c44576757c17@debian.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/phonet/pep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 2a8dee4a327e4..4a350c4379004 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -1116,7 +1116,7 @@ static int pep_getsockopt(struct sock *sk, int level, int optname, len = min_t(unsigned int, sizeof(int), len); if (put_user(len, optlen)) return -EFAULT; - if (put_user(val, (int __user *) optval)) + if (copy_to_user(optval, &val, len)) return -EFAULT; return 0; } -- 2.53.0