From nobody Thu Aug 6 15:01:45 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 4hG9V21Xy2z6nBRV for ; Thu, 06 Aug 2026 15:01:46 +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 4hG9V14w8Sz3FDD for ; Thu, 06 Aug 2026 15:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028505; 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=YINArXmbFBWIU4LgJKnpdCmorI6AfXaTYJtl4tSyAc0=; b=YDmasPYGIjqEJiw9pcY7SKPEntPKSz9muzGLNqWNs7fWsKVBylIsmidyVz7r3jwSZosjB0 aNZvrstnHwyrduCeoJtlyRsDkdJVyDRr1Ahx1VMRbpwGLL3na6abykuwnqX8+BfoAyf5dv O1pBdY9p/s5oECkN0gvouX/IEo/ITuclxnElCmqAq2w6Z6AlfvSzIDQwzkVzv8mq6rsJyI idw61HNc8WCO7Fh5WjxS7q98SwJ7v3B0qI6hq6w0Qxm5AoW1RjOYNlv5xhTfr86Mza2XEH LeUzXg/MSganOBEa284Yd/YZ7xYk2pPgfFRUWiYIdrcDgJkRFMR9j4ccJR7nfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028505; a=rsa-sha256; cv=none; b=B1GL1v7J8BEQpTMvhIjPBjm2cGjsCserDHRsOOxk4rUNLD37uLOFG+D7eIVALIaMgtWz41 PF53xRj/t4/TbGMEgCIU32+K+fpskwhgFel1h9tQRFrJFmW05Mxd/IHGnBFRi7kL2BKamq lx7Ll9YxrQbRM1CUqRoBDgeDGyopNzyIzmGOnwgtqDT1mJZkeuZZezpYeqAJqYq3BvZ12B T/yU5TFcCHe/RMzLJgjRnJd/ue/pLBHwJPSc3T3mcNyJGUqnz4f/vRTSQXacIwYD054NxF foluq+QWXL7OAlolyuOuY4gYBQ/PTtFnjkrjjFwHzchVdxtI1QTdSvP2QUMmDw== 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=1786028505; 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=YINArXmbFBWIU4LgJKnpdCmorI6AfXaTYJtl4tSyAc0=; b=TImgQqTbaCWWeER6gbocidxS6FmucjE7U97/jgfirf+ZlpgW87qnipOHpXrp6eZfB27A4M BpWJdcN25Kc/XqzUAJvNebxFz2XrFDFEsp7lx9W0ac09LAnVXwjV/RnFMN2v3TpUcg+jAC ACxWevvxdB2qTCImfeCru11erkrIwiQaB4UgNtRgg+kDEvNxng5FM0RTKuGCARQiu2RcPx UOZwSpKJKveNP4Bjl01DyWyYbRBG+AvWgxQ+rgLo+LMDatb8G/gxDTFQLmPKjXCaqxvjSO mucXCssnHIOfLS/uVVBsuiX4oa7Td93+EpaBnCxj6ALXW/wAAgC9OeY5UV9gZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9V13vc2z9Vy for ; Thu, 06 Aug 2026 15:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45dae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 78dfadaa0618 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 78dfadaa0618e8b261e813f13f563563dd0ee535 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:45 +0000 Message-Id: <6a74a1d9.45dae.3c1d264@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78dfadaa0618e8b261e813f13f563563dd0ee535 commit 78dfadaa0618e8b261e813f13f563563dd0ee535 Author: Mark Johnston AuthorDate: 2026-08-03 15:18:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 13:24:43 +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;