From nobody Wed Apr 06 03:04:52 2022 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 BF5BB1A853BE; Wed, 6 Apr 2022 03:04:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KY8WS6Nn0z4f5H; Wed, 6 Apr 2022 03:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214293; 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=UbIMwi4Q9ucJtrHFRttYkiJcoNkxvqLpFN6MjS7yuWY=; b=xcjz9tuDvtEOTQmVUnrliLNrqtKsQb1vbrTJLCFAm+njO26smnaK+2H0YyLfgpuK/xRt/o n/inYRMHzCn9rQcrHcCulkDPGBNV79Cw5MAsopdajHTatvn6ejp8IbZLITRLYhaoGwcg1m 0COUC9RxteVlvO6iplFOajGLlDQYTAdFxD+hXOC2moPPIkHFcJI09sYBr4/6nEkMkH5E5c OwXkKSQfeL0J7ZZXmozEgyx3sz2OSk/JJErvWQVUTx+wmu8pXsHdrqYDB97S5d+n7Zxu8j RbKZzicTwzT6gNhm4HirF0Ufvco4aaXrMT0LsiVRtltGciszpLH8HN0120tpCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A49B2130FB; Wed, 6 Apr 2022 03:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23634qZJ035251; Wed, 6 Apr 2022 03:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23634q8S035249; Wed, 6 Apr 2022 03:04:52 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:04:52 GMT Message-Id: <202204060304.23634q8S035249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9bd5d46c0298 - releng/12.3 - Assure that the number of bits for deflatePrime() is valid. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.3 X-Git-Reftype: branch X-Git-Commit: 9bd5d46c0298dd2efcf0e74fa102c079e683b9a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214293; 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=UbIMwi4Q9ucJtrHFRttYkiJcoNkxvqLpFN6MjS7yuWY=; b=BF4FgKPeu4NbWtpoplnFuEcK+hk1dL+7fRSnGS1+arnTJAnwlk0FMOya88i0pTV5jZsdiu qR+p+vGdXpnORROwUGvukfLbPMb2cdcZtFSvlwHn7v6xGxLtC6aUwu79kMPuliuL/Q3fd/ FpXnTtfYINQxXAFO65ev/c3AQVfd39w0zpcdLz5s+pshO22tevqGkjrRMN3rWYYm88MfGj JIOS0eDpFtBpWdRtnHjAQZLL87fAjuTJ3e2uzHrotQPE+FGPmhKbxst2VEMKy52qQZZVaR HcmpLBb257AKSe/vnStnBuMB7PLzJdhc5fizuCJ0m9YeZleARJpm+doNWmqAqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649214293; a=rsa-sha256; cv=none; b=eOmeVNkeGGmI5V59biIMzZWfEvUuEqU/U4xhBC4bYXCN65kXI5Is+ESf2a8CnjdXYPr1UV O4qH1Gb/wriV7Qou7tqzs7VGRF49f8O6MkkXh+R9cpTRAV48uJgfGA+OgPu7Xkq0ySYDuj 9FYr7emZcRJVI0PVSFZyX8i4IqNEydoBiRJJG8odbk/FZAZk20LX1fS3cc+TNTxeee2vwP U/7AXhGFtAAGjU+us/GrhqSB4PSkXaIq+6V86/3ZniPIApLu4XYRGicFphyxIq7sVEi41X zY0ZOJ3E0x9Nu7AAJ3XvVmnGhOkShN9St3VCBBNLTEHEUX8U039/AhU4iPi8Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9bd5d46c0298dd2efcf0e74fa102c079e683b9a7 commit 9bd5d46c0298dd2efcf0e74fa102c079e683b9a7 Author: Ed Maste AuthorDate: 2022-04-05 23:34:52 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:34:52 +0000 Assure that the number of bits for deflatePrime() is valid. Cherry picked from zlib 4346a16853e19b45787ce933666026903fb8f3f8 Approved by: so Security: FreeBSD-SA-22:08.zlib --- sys/contrib/zlib/deflate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.c b/sys/contrib/zlib/deflate.c index 50e8eb84c429..587ee5e28abc 100644 --- a/sys/contrib/zlib/deflate.c +++ b/sys/contrib/zlib/deflate.c @@ -589,7 +589,8 @@ int ZEXPORT deflatePrime (strm, bits, value) if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; - if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + if (bits < 0 || bits > 16 || + s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; do { put = Buf_size - s->bi_valid;