From nobody Sun Nov 08 01:35:21 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 4jMb8965Mfz6yHHh for ; Sun, 08 Nov 2026 01:35:21 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMb895QFpz4rH1 for ; Sun, 08 Nov 2026 01:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794101721; 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=sYYr+7GjAeDsdeMjZHdP53XIAIS3RPHvfZolx6Ckwy0=; b=r+sAQLsOnplOxum/iTUYEzKeAejvXST4R3kdFjg/rlTWxZQK7yT1E9oEQJPa7eXWexnB5+ Vcxk8klCeyLjloPc4Am6Vf9/J4fM/FfNeVAMNKw1N2R4XyCjtn50IuByipLKSiLi/YicH1 EKjv6L6iKcTFfC7LM9gz7pn0dgekr3mJO9rd8griefgB9I4DnK4ZOhrAs2bAAVsLP7+eUQ LbWmLw9r/JkBdtD0CdqL/aD/EhkuLtwpRuxQx1SKxrL0KBg/HmuTuTUi43hhdV5RmUXKzn rkfL96TJgOO2ZzMCnCplooklFP+pRzxayobkgEBM0Fp9ARBq4A7/ozq141IGHQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794101721; b=MSArON75+xpm56h8oo+znG1iZprBXwTlHvLqwp/RqpCEeuRct0Wcey8irahCtneGXhWiOM iDvi4++6KCS7QMFP78agU7Ebmg4eb19f0f1xSBaLzNNtc60LasxU5IRxROkIgwtXONMq5L 0C5C/eZh1ECadiTv+sjK8LfG756e1Eg5Lqi0YVcgAtPHFDPrTkrDimjgLuT3r/FigfcavS RhWK8sCSRsKyoLb6au585VEdnFhGA9rrdpvLPU8lDLiSUlZqvvYAr4SizRsyzi1tjtTdXV LlqSAyYTAwk+zmdWIVPMeTjifzAebA6s/C3RAMJEdM9Tni2IKMgMW47Qtoiu4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794101721; 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=sYYr+7GjAeDsdeMjZHdP53XIAIS3RPHvfZolx6Ckwy0=; b=hXt1W/T5jOxyklhy7waL+EcDrEToC388e8gY8vMXkKPFvJv3jRnmUKtNQI0TlSCTVtzLHE CXYHD6NGL/VBIVYyfG/DtJDH1Br5WPYwXaqu1f138T3WfX+xN3iqId3pxWG8Cu79IMQCBQ LHXehtba9AomEk2AJWoujInwLXVeFNANmY7AWv72QK/jqaE5D0W0GDwFq6O4jHVG4i3/Za p3WhLAyRY9nrkgwAueGg0om2WI9R6psk15/NYIspvFS7pEyMCln6gZm0BCzkrgD/kp65ky wgTretJ1LnxPK+fN/oFQyGQhL2AN3lshHx1MF3dAJHI2nblavOAD01LKu/Xs3w== 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 4jMb8954THznGd for ; Sun, 08 Nov 2026 01:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 494cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 01:35:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: 2bb983123b0f - main - ppp: bound Predictor-1 decompression output List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bb983123b0f3f7d45833fef59f0989e09ef6ae8 Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 01:35:21 +0000 Message-Id: <6aefd1d9.494cf.f8278a1@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb983123b0f3f7d45833fef59f0989e09ef6ae8 commit 2bb983123b0f3f7d45833fef59f0989e09ef6ae8 Author: Nick Price AuthorDate: 2026-11-08 01:35:00 +0000 Commit: Nick Price CommitDate: 2026-11-08 01:35:06 +0000 ppp: bound Predictor-1 decompression output Pred1Input() decompressed CCP data into a MAX_MRU+2 mbuf with no limit on the output, so a peer could expand a short compressed frame (up to 8:1) past the buffer and overflow adjacent heap. An input length below 4 also drove decompress() with a negative length. Reject out-of-range input lengths and stop decompression at the destination buffer size. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D61011 Approved by: adrian (mentor) Signed-off-by: Nick Price --- usr.sbin/ppp/pred.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c index 04bfaebe9392..ec44128d32f2 100644 --- a/usr.sbin/ppp/pred.c +++ b/usr.sbin/ppp/pred.c @@ -63,8 +63,8 @@ struct pred1_state { u_char dict[GUESS_TABLE_SIZE]; }; -static int -compress(struct pred1_state *state, u_char *source, u_char *dest, int len) +static size_t +compress(struct pred1_state *state, u_char *source, u_char *dest, size_t len) { int i, bitmask; unsigned char *flagdest, flags, *orgdest; @@ -98,7 +98,8 @@ SyncTable(struct pred1_state *state, u_char *source, u_char *dest, int len) } static int -decompress(struct pred1_state *state, u_char *source, u_char *dest, int len) +decompress(struct pred1_state *state, u_char *source, u_char *dest, size_t len, + size_t destlen) { int i, bitmask; unsigned char flags, *orgdest; @@ -108,11 +109,13 @@ decompress(struct pred1_state *state, u_char *source, u_char *dest, int len) flags = *source++; len--; for (i = 0, bitmask = 1; i < 8; i++, bitmask <<= 1) { + if (!(flags & bitmask) && !len) + break; /* we seem to be really done -- cabo */ + if ((size_t)(dest - orgdest) >= destlen) + return -1; /* Output overrun */ if (flags & bitmask) { *dest = state->dict[state->hash]; /* Guess correct */ } else { - if (!len) - break; /* we seem to be really done -- cabo */ state->dict[state->hash] = *source; /* Guess wrong */ *dest = *source++; /* Read from source */ len--; @@ -177,7 +180,7 @@ Pred1Output(void *v, struct ccp *ccp, struct link *l __unused, struct pred1_state *state = (struct pred1_state *)v; struct mbuf *mwp; u_char *cp, *wp, *hp; - int orglen, len; + size_t orglen, len; u_char bufp[MAX_MTU + 2]; u_short fcs; @@ -194,7 +197,7 @@ Pred1Output(void *v, struct ccp *ccp, struct link *l __unused, fcs = ~fcs; len = compress(state, bufp + 2, wp, orglen); - log_Printf(LogDEBUG, "Pred1Output: orglen (%d) --> len (%d)\n", orglen, len); + log_Printf(LogDEBUG, "Pred1Output: orglen (%zu) --> len (%zu)\n", orglen, len); ccp->uncompout += orglen; if (len < orglen) { *hp |= 0x80; @@ -218,7 +221,8 @@ Pred1Input(void *v, struct ccp *ccp, u_short *proto, struct mbuf *bp) { struct pred1_state *state = (struct pred1_state *)v; u_char *cp, *pp; - int len, olen, len1; + int len, len1; + size_t olen; struct mbuf *wp; u_char *bufp; u_short fcs; @@ -226,6 +230,13 @@ Pred1Input(void *v, struct ccp *ccp, u_short *proto, struct mbuf *bp) wp = m_get(MAX_MRU + 2, MB_CCPIN); cp = MBUF_CTOP(bp); olen = m_length(bp); + if (olen < 4 || olen > wp->m_size) { + log_Printf(LogCCP, "Pred1: Bad input length %zu\n", olen); + fsm_Reopen(&ccp->fsm); + m_freem(bp); + m_freem(wp); + return NULL; + } pp = bufp = MBUF_CTOP(wp); *pp++ = *cp & 0177; len = *cp++ << 8; @@ -233,7 +244,7 @@ Pred1Input(void *v, struct ccp *ccp, u_short *proto, struct mbuf *bp) len += *cp++; ccp->uncompin += len & 0x7fff; if (len & 0x8000) { - len1 = decompress(state, cp, pp, olen - 4); + len1 = decompress(state, cp, pp, olen - 4, wp->m_size - 4); ccp->compin += olen; len &= 0x7fff; if (len != len1) { /* Error is detected. Send reset request */ @@ -245,8 +256,8 @@ Pred1Input(void *v, struct ccp *ccp, u_short *proto, struct mbuf *bp) } cp += olen - 4; pp += len1; - } else if (len + 4 != olen) { - log_Printf(LogCCP, "Pred1: Length error (got %d, not %d)\n", len + 4, olen); + } else if ((size_t)(len + 4) != olen) { + log_Printf(LogCCP, "Pred1: Length error (got %d, not %zu)\n", len + 4, olen); fsm_Reopen(&ccp->fsm); m_freem(wp); m_freem(bp); @@ -278,7 +289,7 @@ Pred1Input(void *v, struct ccp *ccp, u_short *proto, struct mbuf *bp) } else { const char *pre = *MBUF_CTOP(bp) & 0x80 ? "" : "un"; log_Printf(LogDEBUG, "Pred1Input: fcs = 0x%04x (%scompressed), len = 0x%x," - " olen = 0x%x\n", fcs, pre, len, olen); + " olen = 0x%zx\n", fcs, pre, len, olen); log_Printf(LogCCP, "%s: Bad %scompressed CRC-16\n", ccp->fsm.link->name, pre); fsm_Reopen(&ccp->fsm);