From nobody Thu Oct 08 20:43:40 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 4j125S4GQtz6wCpl for ; Thu, 08 Oct 2026 20:43:40 +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 4j125S1h8wz4bZJ for ; Thu, 08 Oct 2026 20:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492220; 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=RgmBH51NYmaErjoPZj7LxZnrW+fMTh/dkSIKSyc9tPQ=; b=oWU44L6LNO4R6fCplivyuhqgluIornpNU/HYdGVwr1nXbKMrr/G4YzNE73+I6xzwCfw4fn GZRFDx92nzOofdwbmSdbWnkn56CvPYz5093LJsTvr8kE3qAWfb8rKlOfDLGJaPQIEotPU7 fqRJ/MfUuIY+Ytu8ZJrib+Vuumh0Ew5RfZtbV4atsmLk3us7LXI5Hy3Rg9p7bZyAdeaiSH KggjvORCJ/ydO5fK0/dyVwSvSxxNFR/9G4xYDU8RM9g2p62nKOf/a+D71OADzxT+cIOaM1 0L50dGhuBbxETIJKujV5vt603NFF3YWTi+cwqVeurrP/Dhyh/4zN07j2VvnXjw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492220; b=gguh90trRsIzohwvolZt8xcCmsG0lI0NFBByTKkYD+v396DpS3K/3s6grTpBlwGJlyjrn7 9AD6JR3/XSgk1cObcPiNuxgnJLXjZtUv6gmWbolexp8mBj/q8oVwSS/ZOn/2R8mqzwSCxQ 39lkdx2K0lB/m4EHrfx/WNhASTtqv/OAZI/rJG03GU1ML7GjcxwMDEmleYStullcpc4dgB PrnAt93Ge/U0G+PzL4St4g2sU0SDo4VtELrcTV8oZ8sl86We6uADOR8pMgmJODjhrDkzwS YfgWVq+Irgb2MRdtZEQr6tA/h/bSC4zk55ubkONPgdosQyyn+Ap+fcDnXi0DeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492220; 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=RgmBH51NYmaErjoPZj7LxZnrW+fMTh/dkSIKSyc9tPQ=; b=FtZLsK/X2+EXGidh0R0PhYX6n/CuIdMKPq2TNQieFBFH+KP5LkuLAggnaj1iyXwkgLawut 8pn/KSRSoyfHR9xA7kkAE73y7/t4GtQhe1WCPLbYepkbS4qXaalRCNJJe/xR93+GNEgByl GAhRkmTDZkB1OES531BUHyUdRziiJchhc4pGwMu6KP7MLTlu1awtcXPSZiMTTzIFpy2Fs1 59zXItyKKFgOiEQjJoqTCzNbaI7aUG36IWu2qI00C+HGNX2YqiyOSCGJNgyqp5AlvPvxEQ EZAienOJ59PddpFgHItwpsg7ri2ZuzWe0y4qQvJj8R0C4mk5Uge/yu7VlbRVbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j125S0m8Czwnp for ; Thu, 08 Oct 2026 20:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32445 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7f396f144b17 - stable/15 - ppp: Reject FSM messages whose length is smaller than the message header 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7f396f144b1737cbfd4f8ce9a8b790e188c7b404 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:40 +0000 Message-Id: <6ac8007c.32445.cc3a863@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7f396f144b1737cbfd4f8ce9a8b790e188c7b404 commit 7f396f144b1737cbfd4f8ce9a8b790e188c7b404 Author: John Baldwin AuthorDate: 2026-06-10 13:44:10 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:30 +0000 ppp: Reject FSM messages whose length is smaller than the message header PR: 271843 Reported by: Robert Morris Reviewed by: des, emaste Differential Revision: https://reviews.freebsd.org/D57139 (cherry picked from commit 4d8fde8cff0796f32e659036543aa17d16a15b1b) --- usr.sbin/ppp/fsm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c index 5c011bef7f4f..060a9149a6af 100644 --- a/usr.sbin/ppp/fsm.c +++ b/usr.sbin/ppp/fsm.c @@ -1060,6 +1060,12 @@ fsm_Input(struct fsm *fp, struct mbuf *bp) m_freem(bp); return; } + if (ntohs(lh.length) < sizeof(lh)) { + log_Printf(LogWARN, "%s: Header length %d is too small - dropped\n", + fp->link->name, (int)ntohs(lh.length)); + m_freem(bp); + return; + } if (lh.code < fp->min_code || lh.code > fp->max_code || lh.code > sizeof FsmCodes / sizeof *FsmCodes) {