From nobody Thu Aug 20 17:53:55 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 4hQrfD1P78z6pFg2 for ; Thu, 20 Aug 2026 17:53:56 +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 4hQrfC2SBmz41Hh for ; Thu, 20 Aug 2026 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787248435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cq0fUJ4r2c9zdTSiwcKTn6Y1d4FU37QCpY+rgVYbmuE=; b=xaqNFLuyKYqC1r4sfSMgmtt5JlozZMeqMU2G4L0xG7RvHYbeqFqZYU9Zzj5Wu7FCrDGGvC z9vQ4REGmyYo1lFfX8NsVNRG6P8PWLvxUjZfddiAgzrs+vKLXxxeQVlzhadjuDahKes8Bo sdaiCuvll/Albn2DJGavx/d1CVcT+SgwP8sw31L1YK+yiV6OyzqTvZM7+L42wJIhjR4VQJ gog37YOAOsEtRgCcrfOyiYNMHA0tIApzU9Redua2+ZL5n+agsLEhzdDpEccneDLEG4QnUw 95mRvOoaqoG1dZijw1A73SYmatp4csqRGHr7ZeIVGC6eWD6jkPQywfry5l33FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787248435; a=rsa-sha256; cv=none; b=ANb5wmjGnjAASXm3KHewCYJQ6YGCIpXVsxtPciDjzldsKI46yCSgFPU9j5KPjOlOfqSlqt qWuB5ez6KPulwg5BSlUhoeFYKf4LIFZyLQbrWIxsUFUCVo+YLxOty09n9SESKyQlHVKg1q A+/VqDeYDOswOnu1q5KZNoCtETirHA2kpsM3t1f3mcYV8sKXxPpEBhNmT0ozb1FE8N2dMH O/Dsc9/3TqdXxJ//U5X9t5DDhuBq/drE95CDA7+4LFYZ0CEgBWmFzXA3Yz41J+k7Xr0so8 sFq00AMrW8tSdwhXvJdds7MvTMK80FxcbxyWnkP7hevVkYXtOvPZvHn4q6pGaQ== 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=1787248435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cq0fUJ4r2c9zdTSiwcKTn6Y1d4FU37QCpY+rgVYbmuE=; b=kvPe248ez36pCftTu2SPfpaNJlc//lhLnCYkX0r3iXPsr5C+Ly6FPCFkAibtvOhn4HbjX/ vA/szhPbHS+qh/NjTlNd8xrpUX5jVvc8T5wAd3Zp05QMyumK2WHsF2gVw9SHPWrIhZEwUD N4XYAp3x4kZiwJcG/p9toq+z6ksZF68yWOBt4zjzfgR3LNFF5gfr/UolDxHvwiJ0T8HQl6 lG9YlW+pSPraJUW4TAhOzgIpI9Aqe36YyQegsjMHqeGfQ7wtH8LdHkb+uQixnoi7UpEDZ7 MFq5fcls5fOU7n4SeC3cOxRHEaXSGEAUgKbut4bB6JW3P/3hmu5UkJeEqpK+Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQrfC1DQFzBwZ for ; Thu, 20 Aug 2026 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 462aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 17:53:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 281fb7d8a20b - releng/14.5 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 281fb7d8a20bbdeb20241aeba2f4b44e261d5522 Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 17:53:55 +0000 Message-Id: <6a873f33.462aa.1ae00354@gitrepo.freebsd.org> The branch releng/14.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=281fb7d8a20bbdeb20241aeba2f4b44e261d5522 commit 281fb7d8a20bbdeb20241aeba2f4b44e261d5522 Author: Mark Johnston AuthorDate: 2026-08-03 15:18:25 +0000 Commit: Colin Percival CommitDate: 2026-08-20 17:52:58 +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: re (cperciva) 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;