From nobody Fri Aug 7 12:42:23 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 4hGkLl3JkDz6n1Qh for ; Fri, 07 Aug 2026 12:42:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGkLl29sZz45xP for ; Fri, 07 Aug 2026 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786106543; 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=PY3ScmKGvqyCjsuk9KEJZSmVRFTAKY172KD6om/ofnw=; b=fEmhmZ89As/gbJdz/cqpC9tzUO62VMnIz9bApGmv1mp7EVDCWJzkdsEHZeibDYe93JDPMl d0yTVM2mhQ4EEqWG1PlXPPsKZ6wYaqsKyK9zYO5859rnB/pBWXzzKqArtS+jV+GqTcU+w2 Tt5OfTXLuqaja6tqXJkBHoSF2O5apfQybSvADtv+6PCNWszPwULLqJOM3K1JUjN5E1b9C7 J1GFmIKLYFrHH0d4tS6AZEYA5Eu9PtcD9MDOY4lZaYhJj78TSL0qGvnfhwO7JKAdSBDtgp qScf17OzHZbScOWkXkHYCwte+BmdTAOPOkeRe+Z6agjzTWfLMba1u4hft8j7nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786106543; a=rsa-sha256; cv=none; b=I8iuNJciTJXIsECZ6gAxPn2/z6JA2KMovOj7mCBz+YLZg1nKVjMiKXn0Rw2wsrYccPFzVH 0zHVFHgyWFJIwdMRbp71kr0xb/i+YuozGVVrBBpCfgGAN1mQThV4uiDSuZeMBt8dsmchk6 XQidnEG+f+BCov7yJ4lfU6jP+5+xv2Ao2yoVb4ILaECcvnBAubgvjH4ORDEHAypBuGukwH jrd5zDBGYuKf+AMuPlRtHovEf5QRiSQMjmfkF2lMNSwyQAMCdeY4KOPzdOx9RXOrm7SB2m ZuQ5WREkWKoIbaTUredxW1IBfd2UVO41hNc6RUBYEONk+KSaFzinHV+eVoKBOw== 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=1786106543; 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=PY3ScmKGvqyCjsuk9KEJZSmVRFTAKY172KD6om/ofnw=; b=E7VTxKA9FzWNChmu9GGRSCQHaE6ZuBLIG3zYhNGIn6zVb6H88wbclLKveFOGXI1hKvOFVq 4saIXqbyUEAkcz4zm0Rwkfrjz1yDRhQCCKLUSiJ8f2W3eW3Id3n6RvtHhJm/Gd0+w2MRAI UwO0fvPGpJE/B6yPWX9CR8oGDV7KUOmmbGzfVqUP/odTaea7G3uXFPRXcJlFHN7CXM/Urc drbZjHfmm/+NItxP7bJ5zDzVsdQsXZmntkZYww0yOPCd3I6wSpohsYxfJEU7aKokDIhQq+ yzK60fiCR2dwfU6qe3DjGazu9jLY3SwXwo3xraSabjgdsST4oopAkGU5VBFiAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGkLl18q9z16vv for ; Fri, 07 Aug 2026 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39e92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 12:42:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 607c41d8f869 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 607c41d8f869243db275a6b1bd6cc66bf58d0f36 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 12:42:23 +0000 Message-Id: <6a75d2af.39e92.335b54b3@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=607c41d8f869243db275a6b1bd6cc66bf58d0f36 commit 607c41d8f869243db275a6b1bd6cc66bf58d0f36 Author: Mark Johnston AuthorDate: 2026-08-03 15:18:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-07 00:40: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. 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) --- 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;