From nobody Tue Aug 25 16:00:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hTstz0TxZz6pbKS for ; Tue, 25 Aug 2026 16:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTsty40Zjz42vK for ; Tue, 25 Aug 2026 16:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TTGkCVUt7g2n3Ag0iTBrRZL1vCqj7vXFyg6QR8Vknvk=; b=l+RxJhvWTU3T6XELGSy/0LI0qSgt7wekOONGbMat0wvddW7c4pQCZBjOt/TjFUAUVFVXAc my6TLpKV6N2KoWb5ezWdZ0WO7/uM4lTnELEmEWzw0SPBfdQOUvzKU2EDEVo32IuC66AUOV B+dHUUaY0f16bkOAyvqBhnGBgBX2kWkjBAla9IBeL4j0T9IuGq+EfPaVc5JZwBZS5uej8w Ry1ymB8AFaLGirxy9RI6fGA09YBdrI2a8NmHS8uEJTzxXoigRaCP/BCRhjCQA5sLoTVls5 T4nGbPaWU4TVlWdmvXFFx+v/ChP1yKKwZmTTG8LzV4NQwP0/tE8pzESCXVupPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673626; a=rsa-sha256; cv=none; b=qCwdXQ8/i+g2xAjKTMoqp46WpwP8ZseScW0GEw5saeheHspTAhXiBu/9uOLX9LT/h6N3YV owpebzlMyZ9FOUmdcVFDUPYdgxPPdC4edsrKmn6CMgCYsX/pcW2PRyWCBwqYMy9yhPJPtZ gC9aqonXpKUlnUUlWPSD61m3FmLqaShCOwfn6j62tSqKIDUQbDAb0RNlvRcAL0VBQgUueo 0vdEYA0/kv4gFrYfLeUWEg+AW5PU7z0/jzfmgwALU9Z8cL5j/DiNdPUc+2dSlVgsBq2Y5g 5kbcjDR80CdqsRrL+Rt4dXGmslmAX83G5p/AmVqqnyTywpHR3VKjIgEKTEZjIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TTGkCVUt7g2n3Ag0iTBrRZL1vCqj7vXFyg6QR8Vknvk=; b=vRXcSntg/XbHUhk++O/kq0eGSwrg36ia5HxrsSJa0pKD512tMd6DUdzWmC2Gz+Rfc5TMvU Gz7sFRlIQfa3YS9CqjMMtj3TlSlYJancp1t7BD7BBx7O+oLcN1a2pVuvn38OV/XkxrZAKR dKjdZaPG6UCUz5EllmGDu33gebMCzVG8XCJe7k3/HvkFBntUjXfhSFAf+smQBlY1fgHGQI oCh0pKLgXNiUGxtjTAPJEzqS6nWqFVwO/pAiyzN5d0B3XsJ8N0haJq8YjVju/c602s0bwy TC+mFvs6O0T08BTkOEAtO/eDNNqaQujYhRqyPVQ2DaAOQZY0vgMcXHJpezijFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsty2wWvzy7y for ; Tue, 25 Aug 2026 16:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:00:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0cd984b41c2f - releng/14.4 - ppp: Avoid overflow when formatting endpoint discriminator options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 0cd984b41c2f41d3734be863ea3ca301406e82b6 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:00:26 +0000 Message-Id: <6a8dbc1a.336ec.4a2005af@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd984b41c2f41d3734be863ea3ca301406e82b6 commit 0cd984b41c2f41d3734be863ea3ca301406e82b6 Author: Mark Johnston AuthorDate: 2026-08-03 15:18:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:59:03 +0000 ppp: Avoid overflow when formatting endpoint discriminator options Each byte of the address is represented by a pair of characters, so we should be multiplying len by 2 when figuring out how much buffer space we have. Previously, a sufficiently large option could cause an overflow of the global "result" buffer. Approved by: so Security: FreeBSD-SA-26:60.ppp Security: CVE-2026-58095 Reported by: Joshua Rogers Tested by: Décio Brandão (0xDBJ) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58555 (cherry picked from commit e004ff15f87e6aa8f2aa13cd5600ae13457b95f1) (cherry picked from commit 607c41d8f869243db275a6b1bd6cc66bf58d0f36) --- usr.sbin/ppp/mp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c index 84ddb6e053e3..f5f9dd9ddece 100644 --- a/usr.sbin/ppp/mp.c +++ b/usr.sbin/ppp/mp.c @@ -931,10 +931,10 @@ mp_Enddisc(u_char c, const char *address, size_t len) case ENDDISC_MAGIC: sprintf(result, "Magic: 0x"); header = strlen(result); - if (len + header + 1 > sizeof result) - len = sizeof result - header - 1; + if (2 * len + header + 1 > sizeof result) + len = (sizeof result - header - 1) / 2; for (f = 0; f < len; f++) - sprintf(result + header + 2 * f, "%02x", address[f]); + sprintf(result + header + 2 * f, "%02x", (unsigned char)address[f]); break; case ENDDISC_PSN: @@ -944,10 +944,10 @@ mp_Enddisc(u_char c, const char *address, size_t len) default: sprintf(result, "%d: ", (int)c); header = strlen(result); - if (len + header + 1 > sizeof result) - len = sizeof result - header - 1; + if (2 * len + header + 1 > sizeof result) + len = (sizeof result - header - 1) / 2; for (f = 0; f < len; f++) - sprintf(result + header + 2 * f, "%02x", address[f]); + sprintf(result + header + 2 * f, "%02x", (unsigned char)address[f]); break; } return result;