From nobody Wed Apr 06 03:04:19 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 AB5AA1A846C5; Wed, 6 Apr 2022 03:04:20 +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 4KY8Vr0ZPrz4dh6; Wed, 6 Apr 2022 03:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214260; 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=MVXyT6Z9sd/kTPoeL3gftU9LXgEKM9W3OhtSsLoD3h0=; b=NzX6ZEMkeiwkKvJVb3dXXmNhiHkPk46yzlWoUJEh2KvDYLCaoOMnW9W4d+AoR6MImrpoud BbSMHUBVlZvevlIKyNBRvpZsXGIZ8XgZeiDJyl02480jZkWuUbN0DL1UV00JpMVpOCPH4T sl/BO9yRXTiW5UzRMxMkOLeldSOrgMZLcOnJQoV5HNxhMpgzA0wuzOz73u7mTqd/q/HNri aETNZr+wI8fSds/0q7cOLdT7VBytL7j9rwJ79xhrS6vekXNa3Vzh7CK+Kzcy1Ucvi8z3MO Rm06HkUKVA0LgzOGawadDrQsO39shM4AvfP2XhFiSUUmuPGcYkd8hOF2+ZlNkA== 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 A972C130F7; Wed, 6 Apr 2022 03:04:19 +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 23634Jij034863; Wed, 6 Apr 2022 03:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23634JrH034862; Wed, 6 Apr 2022 03:04:19 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:04:19 GMT Message-Id: <202204060304.23634JrH034862@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: 9854ff088002 - releng/13.0 - 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/13.0 X-Git-Reftype: branch X-Git-Commit: 9854ff0880022ebc0bd955a57bc1322228790f99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649214260; 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=MVXyT6Z9sd/kTPoeL3gftU9LXgEKM9W3OhtSsLoD3h0=; b=vg7jxl/zzk8bqpB4eoB6PMqyzTT5lH4aOlWkMDYI9RJJY2q/lKyWzd1M7Yx+WvCEYBMtMj o75mEvuyy/SQ6z6NrrUjaL1P6xCvsSKXpuASlSYvlPuKbcqMbr2lXohGuCxXTMy11JZi9V /lk3tupdkGguI34wmAKswzem3M4n/Hh8Pxm8z6PQN1Wh9yQ/Iq4+GcpbLtti634zkQiqly AMbafCH8Asst4GSDP67p2jGAfQZn4GctorXyNeC4yLc0DROtt5Fuz5tNuMEZO0siLeIxWv uCZQkv/9e04YwwlUGpcMphBWubVwHR1KFo4FrYDQI+DEZSTQEqH9wxItLjbKlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649214260; a=rsa-sha256; cv=none; b=YT7VDvCXYSnJeeeI3rz0i86B04s5jYbRq/+ZppIcCTfYxhKji2c6cJtEvngpgXn2uEgDF0 61MoczbhR62MaMn/5uJ0OnrKAFTfiETwnrledqdBqEd7rB0nMb05CDL3iBji5iMcXadgS5 Ql7ulLwNTdMCJ8uUIQfutTI610DAxCNts2EckQBCpm3/O57ShI5l/9b6oGKmpVfapTNzfw dYTEppnG8vaOq2dHgpGdE4rtFsaA3MZQv8SMKV05Yp2W06TIGW3zqzbrXRQbh5ydRBNfeW lRgaVQB9HIwFf5+8lt5j5YdJNJ9sZUI0ZA1IHtmZaU4gzbB3CUK/et6Da/toqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9854ff0880022ebc0bd955a57bc1322228790f99 commit 9854ff0880022ebc0bd955a57bc1322228790f99 Author: Ed Maste AuthorDate: 2022-04-05 23:33:30 +0000 Commit: Ed Maste CommitDate: 2022-04-05 23:33:30 +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 edbeec0dd09a..f453517668ca 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;