From nobody Tue Aug 25 16:01:25 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 4hTsw632cDz6pbjX for ; Tue, 25 Aug 2026 16:01:26 +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 4hTsw54g6Rz445p for ; Tue, 25 Aug 2026 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673685; 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=xpPleonFPVhs/tnkaKJfZYqJyInPKkV2GgbAGSjeRlQ=; b=uakt2R4ztfjFj2AtQfW9emVTnXyZiAv7ncM/sr4zJanOeXbSXV8f9cUksn1+qUdmhmPtRs uLbqsg1jE33wn/Yh9tzGuyS54icwsxq2inWXELfF6sYBIU3CvhksrfiwDovSAM7jdyO/y0 UXMivg8xfTs7XhM8UgA6gWafPtFLRZcV/tZwDhjqnWS+azsZ2DQkxMuoklTgWaXEyNPvjc mddnhA/oH2MrO8MYj7E+bngB5Jhhld7eIhZiWTkNppr+97/SwZmU8rFRFrYcOU22s/CAjo xQqCXx2PHqrG1Uvf1KjCMyHPdkbPYH20pWFzrJ+dAACSvwlOIaFYEiI01qT9Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673685; a=rsa-sha256; cv=none; b=pO+rXPuTvJuHClFSYhuffL+E8QI73PMLVVUDxLQe+Y0EJRD6Z+boYnXKLVXAGvdPqP+XVX ZVud8YHdZdMJJ5B/T9l0swSeZ5st1dIooLjmBAVN5CLIaFqBp4ZbHnQxjKx88YJIRPwPvf xPdh/sElofjB1Ihhtjd7tGwoikE9umZEcvLkV4ACea+NIQiUGl2jknjCLXCnH9SJJ2du7X 5JXPBGxD6zBIfeY1uEUIf7ESbGfaC1VB1nQJWtcHORbyCeKIXwP2IAzw71aWxG0bmPxHCn JWGXdxM5sx7A4ObeYrjLt4VQ4GLwbyzbTFY52BihDYLuZIlNsMRgxl/s4ogdQA== 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=1787673685; 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=xpPleonFPVhs/tnkaKJfZYqJyInPKkV2GgbAGSjeRlQ=; b=b9weG23RnP2APzQsCzcH8EJytgzl10Cmzueo/dtDC/mS3Xwl2C+79i9dnkO0lGwQ6sIdko pk0lwIvAZ/2rPJFz56kFPsDXfTY3j3c1gOu+MQGUmYzEO1Js9Tw/9NCQ/a4QYpomqdSpun 8JHvDVX7NGHtCXpy/5i1pRUN1N752TYFD5/WQhGl4PtaO7PzqBVH3Uwl1PSiXmzJs82tPR bTKnojKI9UewBrCu9BW0kl9iUy6cNoR4Ev95dZaAyepbuDxPhPp6w8R/ZFGXyfGjUZ2G8/ 3LbleQ+1K4Q5lX6jDOiEjB5O7qQsLmcJuzFrt3XgV4R9OufOgzN3pU3zKT3qQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsw539Zjzxtp for ; Tue, 25 Aug 2026 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33913 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 23deefa40b8d - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 23deefa40b8d06e3ce3ef53dd67c699d6bc513bf Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:25 +0000 Message-Id: <6a8dbc55.33913.38736292@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=23deefa40b8d06e3ce3ef53dd67c699d6bc513bf commit 23deefa40b8d06e3ce3ef53dd67c699d6bc513bf Author: Mark Johnston AuthorDate: 2026-08-03 15:18:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 21:51:29 +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;