From nobody Tue Aug 25 16:01:06 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 4hTsvk6kTpz6pbSQ for ; Tue, 25 Aug 2026 16:01:06 +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 4hTsvk2pXdz43rD for ; Tue, 25 Aug 2026 16:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673666; 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=cayrGKY1kZzygTNoLmdfqmKeG1b+RBSd1YMDG60ko9k=; b=YgvbMll08V1F9lqXAJaP2cEYs1D6fsPl7fHE0VBdMYGq8x90OlqXoxv8TSdteal/PLmK8A FbqFNMK8SXEdTl/dYQKmCZETiEzqdSX2SM4LP1dZ6lrrSyVIHDsJthnpjI7lUGz/5Oq9us i8+ufOwu+dMZ3feJGEf3JeJEnkfrJxYA0Xw7flgqN6ou/VY3fHsbQShe4ezAY9qwC5KUhs w4oswM02KVC5QtCfYDbvdeMcx3jsIilG5YppR9yOawxW6nHMqU/Tg24RqTlidnukYKdnkm 7N37g2Mk+pCyDH5hdw60gCBTspVvdYXZhdh+plsGoahPvt19RVK0QfsEu3+eLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673666; a=rsa-sha256; cv=none; b=JD6C8Drgju8NTI/7bA9S8SQzNNzMQahHi32eM7CprXlRM6g6ZQoPheVYWm+uRKtWj+DtkT +gIqaFsEojds5RYzCdop7fbqY7tj12vEWDth86utkns2NtLBck2nyS5QG9MFYoTV+3/A/8 pUBYqo1oxWjghQBK5sOKZgA7dpFgVtfT3UY8CkoPwRxjrJ/w+rKUBpMnEATMsaPL243fPa f9hmUUb7HqVG9nJUta/blrCawBE+oFSkRAN+b6n2ZUvIoY37l7RrfcatwqKojRvr6p8hSj /Umq01S90brC6tiaSaFPieI4EjQOraGESZrx1ewJ6M35nemuA/FEg52lPPgaZQ== 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=1787673666; 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=cayrGKY1kZzygTNoLmdfqmKeG1b+RBSd1YMDG60ko9k=; b=ix+ypDPwBY1vKs/tgna0/qiXCQum7daiUnwYJJjE17tCOs1KfZs0c2dKOH+kY9ysQe/DUh ZGl9X+qGv59iAeXJg+R4zRUlN6Au69eZFZ48W+4x+eVW+vd9PQcoGHnrr7kU0XZM4zQ63Y A/uA+04M7kJGWxjOhkhaCTc6TfpUSrkULMGm2jxUcwxmhGv+0gqBwXbwyyHhCZPyCKvGp5 cavfWibNDzt8u+pcAdfVdsFLjEFNjXJ6ZfSXDdaxq287aRE5MoUngz62BLbx1aGMHcWsFt zMVyVpYAOAkmEWIfvU8tuzmAZIZDdAA7KOhfsUTe512tdf+IFkaT5fgxG7OXeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsvk1F83zxWG for ; Tue, 25 Aug 2026 16:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7b0db357359a - releng/15.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: 7b0db357359a79cbb50e409d4b6832f618849d61 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:06 +0000 Message-Id: <6a8dbc42.33a0d.50742593@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b0db357359a79cbb50e409d4b6832f618849d61 commit 7b0db357359a79cbb50e409d4b6832f618849d61 Author: Mark Johnston AuthorDate: 2026-07-31 13:13:26 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 21:51:22 +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));