From nobody Tue Aug 25 16:01:26 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 4hTsw72Mvrz6pbx5 for ; Tue, 25 Aug 2026 16:01:27 +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 4hTsw65529z44dy for ; Tue, 25 Aug 2026 16:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673686; 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=CcxP/SrqTZO5I80I7XSVKprkrvZlBi/0IUJzXR6UyP8=; b=PZELXKHiMDQYn0rAVflcn2HhfETo5FN6SBgnCL3HOmYp7+S7h1KsIA1YavvoD2MOKXZCyb GYWJLANrMilok58qwYUB+7r2bZkiNsRPGP2CgY2DUquZhXsWzDN2GKbTKC9oSCHyYJPKR9 eSyh2hlRDWDC5keDMGUyC1Y6gE6NNeh8ewGkRWoTqUPIpStqs20XQ/IOZNNBIBwlluHhUc bDY+anOACfNkk9cs1ypWZ+cXpwixjDt3z7LNnjkm52mZCl8r1MOAB5vrx/K3G8T7Rhsxkb s/llc/ck2JiZbJ/UVrbrxaGQKInKuGnG91FrAIIBTnknCWbdp9MyLYTG6a85OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673686; a=rsa-sha256; cv=none; b=dZgh0bRNRopAtQL6glUeWzjZuNC/x2ezX3nAN+hI2r4jHBqG5tied4rhAoUQqeVYM/Z4gz l+Q6dDJePL1Meiz4AxllxGQtRoBnNYTqRhwLfhqg575AvqAQS+6AdAOTsK7w4LnMCHypOI y53PH7b1/YqpgOSM+UVNbfhk10LbGX7Tp9pQrhBtSolqD7I6lQW08PCDyTv04jAjGUbtyK 6EOauPt8eRdzXvrAfPz4/ehSLHYjhQGgNzQECpa8pIvrRki9Jc5BJAJJ2j3zQDEFQLvM0H i3ErUxoAVuQNvPeQlX79d0tHOQQ+nYu55BczZbAFgc4WfnDHOwXR2BLPfKRnJA== 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=1787673686; 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=CcxP/SrqTZO5I80I7XSVKprkrvZlBi/0IUJzXR6UyP8=; b=jMo++nQHv48TzN8HofD7tZJHipNyvO6Qqy9wgHuR7BSzDx9965GZ/O25p4W4F1miDCMtbI cRtX7OJMakF4fDroCaeI9SlMfOrnMfk05mwgaA6JGnniqDJAnAg8IglMnknzJyvhkppmrI iQl+s/ndT+snnSo8jMuqbsAJR7Y/JPdatf5BuZrc7pOfNaBvwOm9yVelBYFugM0aW3mmfG kuYPoJaWn9EKg19DAMR3X5sLEi7MGF/1YlUxWsAMNkmKx4d+cUYIyr9gAORbKFKce2vIk4 1381aoUBw9PxqUw/qfwViHgvacMvo1mNz8Li5joGBWNM7gSOiBd9r+vFHbFs8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsw63SjfzxWf for ; Tue, 25 Aug 2026 16:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 339da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 428f4b194cef - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 428f4b194cef6ae2c73ff4c0c467f36f6b1a48c1 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:26 +0000 Message-Id: <6a8dbc56.339da.24ddd1d7@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=428f4b194cef6ae2c73ff4c0c467f36f6b1a48c1 commit 428f4b194cef6ae2c73ff4c0c467f36f6b1a48c1 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 21:51:29 +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));