From nobody Tue Aug 25 16:00:27 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 4hTsv00MS1z6pbVh for ; Tue, 25 Aug 2026 16:00:28 +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 4hTstz4nR6z437H for ; Tue, 25 Aug 2026 16:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673627; 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=SgGJdh6swjUfBBWPXU8mrgzLFBLtcmCTN/R4bTF2I7w=; b=UyjdV6jntJ1hg6V9sMaUGjtWiUW5TfaM3hp1wPFRNkeHxFq6VYfQ9mMIIJNLToNlGrhCp0 0IloK2dsgIMMo4b3OMNGSCzRzjXuTZfbT5hO6uiMHaT3JtzjxFBPrGsJ9/D2ciKCEctWC+ M+U3FBGaHqwvdFmT80mVJT6P9igtK7UmPGlOT6wNSAANkr/2Td2UT60k1j/PuM7wbu6neu u//EKrXhK+xC1E7DcTy3kic8i5F7RTZqk+GbrdNXPrOsDysGqgt9hI+E8tj2oOp5wpQ2s4 7n5aV+1PXIyX8NSAJ+W/VdqakHixiLMziNoSy5ndoe3yHF+aV8RB8NkDlgXFqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673627; a=rsa-sha256; cv=none; b=RPashjWwcs6nWa/tH/dVjd5+PrAG/x/sz9PfjXL1SpkUzhQvxwgrCA1rXIBxQhSgYvlcLq x8WrXaQO6emXCPXM7oUEIQ56Z6ovudCgK0Zn9h6QPw9+gsHgPTiZSBFKvpqX9mt/FitZ2l PbqUwTBzlSOIJLqbhzV0u7kL8OjMm9kcUk+gDLUhxhuKWn1JKf5cMmEx0CmPnSlp8NDKYS ONu5kE7rtkvdWO40yW4eiHGT7WXjJzBDA84IVn3GbX9kvw88EagnWve3a4aGicJKGlQ+iX U0/ZriMkRkf2fSlbDtxLZ5cOZyiZEXsMzdyIaRg8d/mycjNCDpJmGZrtMmmabA== 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=1787673627; 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=SgGJdh6swjUfBBWPXU8mrgzLFBLtcmCTN/R4bTF2I7w=; b=w6hxhWL7oeh2K3kAo2ll5x1K4Vo+VSIe1JRhZI2Y16fpHCzsiG7H0JyR5T8jdPdDC3P5ql X8WDTARpCRuzYhghYuuVT3GuzOxnaZiBs6/Fkr4NAFaVz1PY0umrS7BNJ7CrW2DmdledqY UpV+QqAByu8Rizd6PZ8X+6qtyjWxvXxFWUkoSdnn4jmVYpLKXmRSI/Nu8w1ckK5BPu8a3k SBkrsNy4twQisiLuY4GvV/NkZcqe3JuVrqvokFoZ0BzwcnWE3T0MMShZSbghCLr6t/sfYA yssl8cal64FLSDSBela6LxGNpgWI0+HNqS/jVTqaupW8TVKAYcb1MBiDpOafRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTstz3k4jzxbj for ; Tue, 25 Aug 2026 16:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33115 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:00:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3e5e24f16eb1 - releng/14.4 - 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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 3e5e24f16eb13abe5b667214196bf89018744413 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:00:27 +0000 Message-Id: <6a8dbc1b.33115.7477cfa4@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5e24f16eb13abe5b667214196bf89018744413 commit 3e5e24f16eb13abe5b667214196bf89018744413 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:59:17 +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. Approved by: so Security: FreeBSD-SA-26:60.ppp Security: CVE-2026-58096 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) (cherry picked from commit 30b4bdd451ad4ec2470f9a378bd62e948a85ef81) --- 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));