From nobody Fri Aug 7 12:51:05 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 4hGkXv2DNHz6n2Q9 for ; Fri, 07 Aug 2026 12:51:11 +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 4hGkXt5KtFz47Wm for ; Fri, 07 Aug 2026 12:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786107070; 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=2p2lIxvdAc7y+lig9yBB3yQVnJBwV3DmeYJUuikMnvs=; b=vTT3Sner/UziKN7qLHcNKwkZ1uEObkJ9+wk8nKETofFRCZNkCEdliy8tUCTQD5uSIihAZn BfQMFqn3MH4JStWOR7BE1uwT8N0DBIVR7z9dbFyAhJcFx391jSRIMnGeqdWfBLWOQOkK1x H60i3xvqoBDx40GUSRciWyjLRB+56KlllnmoUF8BCk6YJhoVX/AK8Mzc5VMzrrkmA9grMs OwUa0/yRwRrCCpsRkafWXlgY3UbM7BabMRFUo72Tu8N/A+SQSFUGGIeqlmypGmXFWSGnIn NwMWGLTPeR1nrj4pQgQhYRtKbdvlQJvF8CoAdPrZQbV1yeq0UdOcZImguT8eCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786107070; a=rsa-sha256; cv=none; b=GVEPVv4qEuXt32CX50Rg+q/GySvvfm5CmRbC3rYcH0Juxyym4S9fFyhEBuvJhBjkTPx7E6 WOKlzpA3fYPyvV/Tmow8mEhzf+Y5hDkyeNlyQhc/aKr6ygDUNlSLwsbPNm66UVuMCiWYAX gklVVcyiXOoPuHLqMf2kZnSsr95ZEFaZgfjXCBln7uTyd69GAWjEBV0Ovtp7bVGlVugDW7 89PZcNwr20mT00PSG6qRQATeS/mk18gmRFojkYdhR/gZM1jF8DUsbWR5nbeaZgRY3VNiNh uzVG27CwfrsSBWtaFI04GjH/JSbuKWf9DX0MOBGFpRPhkQOhO1LFi4Tvpd7dxg== 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=1786107070; 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=2p2lIxvdAc7y+lig9yBB3yQVnJBwV3DmeYJUuikMnvs=; b=miZPiMoRC8W0QGyTxdAvhVLlWrAtu55KAL562tU02yeMx+PybRfifK9GSlZu1NI2Pn0VOX LZXhLsVXsr/w5Z8r4QgNat4wtxb6moKJ6a1n69MlSukWd+Kw/RfXeD8YkBEfWdtYFknGNb WsL/nqxV/cBPjlBkBp2o22D4svSnZ8o3eWYtCnkVVC40nKdfYsssuii6vDWRjFHY8gKfRa lm9YAcBh3IeJJLlYu8ZiDb4pttOX4m5ymoqfnLzebzsFJSk3TXOex30E6OqKYZVhHKoseE yVl6lC6hYDzbP4NWBe2LFSv7cPcTm+w5sDa8EgsrAH8J19SCcSyYScoGnmXmaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGkXt45CCz16fD for ; Fri, 07 Aug 2026 12:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b931 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 12:51:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 542c98fba386 - stable/15 - ppp: Reject invalid 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: 542c98fba38644b1261bbbfa4816ad53d10b6e72 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 12:51:05 +0000 Message-Id: <6a75d4b9.3b931.10d55970@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=542c98fba38644b1261bbbfa4816ad53d10b6e72 commit 542c98fba38644b1261bbbfa4816ad53d10b6e72 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-07 12:50:56 +0000 ppp: Reject invalid endpoint discriminator options Per RFC1717 section 5.1.3, the option length must be at least three. Processing an undersized option would trigger a large out-of-bounds write. PR: 271910 Reported by: Robert Morris Reported by: Décio Brandão (0xDBJ) Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58554 (cherry picked from commit b9d07a4308226b683b64827e0aaed1180e0da996) --- usr.sbin/ppp/lcp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c index 462f3c4281bb..7029610a1591 100644 --- a/usr.sbin/ppp/lcp.c +++ b/usr.sbin/ppp/lcp.c @@ -1195,6 +1195,12 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, u_char *end, int mode_type, break; case TY_ENDDISC: + if (opt->hdr.len < 3) { + log_Printf(LogLCP, "%s - too short\n", request); + fsm_rej(dec, opt); + lcp->my_reject |= (1 << opt->hdr.id); + break; + } mp = &lcp->fsm.bundle->ncp.mp; log_Printf(LogLCP, "%s %s\n", request, mp_Enddisc(opt->data[0], opt->data + 1, opt->hdr.len - 3));