From nobody Fri Jul 31 13:29:27 2026 X-Original-To: dev-commits-src-main@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 4hBRkJ1kDvz6mnd7 for ; Fri, 31 Jul 2026 13:29: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hBRkH6Km7z3SgD for ; Fri, 31 Jul 2026 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785504567; 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=Iw1y9QpR/Qx81gJLxLvrEbqN6V17tm1m0QmVN3ipD8o=; b=q1sKCJo0RBxJqI5JeGGPgGBPdWnqfkbXXhPlJ5V4QIr3SBRynjnKri+SncRmdDgnAEttJx se5qA5O5ExlsLGQEWutKghFodshGqZqrPadl/UQZ6ZXN0F9TCzmR6084UJ+yRJ3PIkZ8aC fHdsrS75B0IzJpcgEEF8iO4z4Up9x0ymgh2QXgxp/2kTFTlzt/UGDgvG+S3FQAg0ORoJyR 2pplUUMjMusIMxlUg96HtN6X9y+EHi+q1d5FvGWkJwT9eYyF/aFzVmNA4poqc1D70GQo/r no4c2odmrqNkifp16SnPrbJ2Gw2BCDLMoucrN1yI2y3fyLh0bPJreHIk6zzMZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785504567; a=rsa-sha256; cv=none; b=KfcrnJy/4IFNk0OgkdKymDd/7vmxKJQy+KN5APkmFfhQMiM+uAT7T4yMgxYCQ3Wx9z0aDu a4Ig01sm4+SyyXK+n39wt50yx7yZP8WXgmxq1DtKYb4+D8Hl3lYqRRqzfoNdMe8GsqMIKI A33uCdW1Qh4dnUMCNyxEULPENAFYlB7lyjsQuZJhhxecFpg59KEvRd1r8Dt1q/kLf0SO+R cO3RZXHmUOQUA5pC/e9prhCOcnZFmxXm0kAGWVaW/wpAQb67ibrHyvsT/RkaAqeJQxifBi rKGiI5ah7KLZszX3pw6+jX4ENGE9B0vPwbhDvhHCCEofw4SYObyrH+4/B74vYw== 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=1785504567; 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=Iw1y9QpR/Qx81gJLxLvrEbqN6V17tm1m0QmVN3ipD8o=; b=EzkQO/6RDrHbl6x3RR2IiFJPrKtfYnFdpf0IsrOnRLCvPTjDD3jxDNWzT+e7jndhSvCpql 6fTmUosgulbZYvS/cdFWBS5mbWQC2+TeXKz4fzJtvLrUsltfid7qfy3hgZvnanoWFqcALI F4Xa8CTZhQMemzZrpJT57raXwQDx/EmbgrJBcFQtXF+Ije4fC+Nc6Hznaq9A7G2HdnLwXh mNTX9TjkyDBfhixk0enLWcehJK28x/puE/F+MwDdvZNt6eUOmDozbbJvJ03NDoz1So9QZc uvYvYxo286xhJ+eoojjNnCVA1W4KKoxC8DX1EEofrm8jP44X3+XRun7rPautzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBRkH4Yjnz11Wh for ; Fri, 31 Jul 2026 13:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d4d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 13:29:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b9d07a430822 - main - ppp: Reject invalid endpoint discriminator options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9d07a4308226b683b64827e0aaed1180e0da996 Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 13:29:27 +0000 Message-Id: <6a6ca337.19d4d.cff5114@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d07a4308226b683b64827e0aaed1180e0da996 commit b9d07a4308226b683b64827e0aaed1180e0da996 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-07-31 13:13:26 +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 --- 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));