From nobody Fri Aug 7 12:42:24 2026 X-Original-To: dev-commits-src-branches@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 4hGkLm4JL1z6n1dT for ; Fri, 07 Aug 2026 12:42:24 +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 4hGkLm3BWGz45r7 for ; Fri, 07 Aug 2026 12:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786106544; 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=oSZ2T6WWW9sXZuBXe0PsO67Hsu1nV9VG4Apt+mhYdTw=; b=krLAcWgaVIbb5l6ByZY0FOAJDVr1haj94NQzckPBui64hlIcm/XsyVTHF1eP5miOdIV4hi mIxgIa9M3ciCgSDk4gysbBEH1LZRymHkiOdbwwbdLzJA3jh9yzGV0CLBFF/JyztzSplE27 CZdT/u5lEZVvw/px4uK/aZEXqT/Ja8+dgW9gVFn6aynQNK6uKFNJvz7dnaqx/xdhJufzYP L2z16ziu/mFNcIuxWJGTd9H3mPAwy0FMjyb6MTvxikE1sK0nuezqLCpQogA+EHUYD/XHW9 JvXTDwdxdMXGSlBZAoBOjc3QPyWgkBAP8JOetjLQdyStODFCEpkygMWkgZKF/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786106544; a=rsa-sha256; cv=none; b=W646zPz7G9OeuaqHL/pPZ5MF8G5pje4R/SfI+npgypPljzHgcxOs5tQ/TusA6+jsgCa1pX FdpglKeJKW4YG8aMXPt3UpAdIrXt3VAA7BQJ+sLBYmENxMf3kqUC0/8qn5u1jii3LqA4ei 3u5EmeeVELMAq7vLE+PkYp5ZR5w0s9RZ9a5B/HDg4nwkWBWV9TarJl8plk9Qn0PCCImllA KFrm2R5lt/DX9Io7wHO7BwX2NBNc+4FpQ8RNv1sQ3vFBlpOJhcaKGkoTgGGZhk3snO7UiY NISfwJdw59SopPqQIpXEdgUdxM0JoQc/hZogWDRnftkUrwV8zf1OdvldeuSV5w== 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=1786106544; 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=oSZ2T6WWW9sXZuBXe0PsO67Hsu1nV9VG4Apt+mhYdTw=; b=V0acikyEP22zSawFxL4fUpWZj9oxw45DqhwvNh5ltF07BIv18RB5yccVWlqWsvDFeoA/JZ cHYRVicPgVKtl4qORiPhSxZ/n1t7o+tQmvoWweRC4eukg3rWO0VyB9IywrfgZ0Zd5bjUdR 9r8H7EAJU9QhqUtxbNSEgu/aIBbWX+Vx5Lau2CPxQQMX9GdZY5+QfHuhNTIN3Fls1BrQKP +pVkqC8a5eu4NMi9BepAvh9Z7Y2uQ/LmkRMutJ9+5R0V4Q5BARDnCeJJZuJ4D8F6/aGFKc c6y07t4O7yEdh7gOiMc43aft9LNwiiMRKSCBUBvnBfDq9D7/mH34Zohs+HDeeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGkLm1wm4z15y2 for ; Fri, 07 Aug 2026 12:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 380fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 12:42:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 30b4bdd451ad - stable/14 - ppp: Reject invalid endpoint discriminator options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 30b4bdd451ad4ec2470f9a378bd62e948a85ef81 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 12:42:24 +0000 Message-Id: <6a75d2b0.380fb.5d2de9c1@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=30b4bdd451ad4ec2470f9a378bd62e948a85ef81 commit 30b4bdd451ad4ec2470f9a378bd62e948a85ef81 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-07 00:40:03 +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));