From nobody Mon Apr 04 01:05:29 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 B48EC1A520B0; Mon, 4 Apr 2022 01:05:29 +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 4KWsyd41Tsz4rjR; Mon, 4 Apr 2022 01:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649034329; 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=V4uhT+dGpxrtvbH6u3EIyJPdE2W59qYGaqa9fS5uhbA=; b=ITQhz1QcKReThJx3BqYMVcITA5ciSXQl1k+ozALTiu+/IJG3maLjVrmk2wKfeuZpFvvIUd +bW8MB872vcMukbKBpxyL2LWDmTs5WdLBqnkwqh2NSlyvi8Xlo0FI2Uyitm9o/pydMO2LC GfGXixkkRiaJKh8MV7cXIhKv82JNgA9q5jnDFXmwhBt+cehT7Z6V4P8ZXHoaK+Zoi7frB5 iKYquIkdFpe69jfbC8f/i/S+8z44oKfMm2AIy427fCUjpkdnQx+p/+aFgG8kZoZaA8tf7Y Y04Vyd19HNbkPigm8gpCOAfLoAZj27COpmR1ihw1jrBLjO5l8CpxS0Ot3wj+Bg== 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 52DCB225; Mon, 4 Apr 2022 01:05:29 +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 23415TPA077676; Mon, 4 Apr 2022 01:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23415TqC077675; Mon, 4 Apr 2022 01:05:29 GMT (envelope-from git) Date: Mon, 4 Apr 2022 01:05:29 GMT Message-Id: <202204040105.23415TqC077675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 6c9d85b8fa70 - stable/12 - MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC functions. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6c9d85b8fa70ac8f61ca189114aafed092fda921 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649034329; 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=V4uhT+dGpxrtvbH6u3EIyJPdE2W59qYGaqa9fS5uhbA=; b=kUgxA2SN0uVRd7vphQt+zOIU+uSbX7cGL7xYUKr8BA119fo6CsjWsubD8tTlZO5IQWJQRu jPFX8TaSiuTYKbLKgBfJMEAThYnoN730KByKFrSOtumRfitXc0zzuulrbqQ53XLs4asEfA ehNe/qYgt0Gb9w0h3BAJ4k+kHzlR84YnnLbvASgGeIgzTSMaaU0uzTznAOn+iSLUNNJA0s G62iLofwpcnEbO0JmCeFes51MOoawOJzrwxDapfIKgNgQ96TzNFw2VOX5IShYtbUDy5qIQ WIiaxBvWz6tNj8UQdV1nvf5DYSzHASOvuaSH7ERetq3Y+0cCJEqeD3iR0006lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649034329; a=rsa-sha256; cv=none; b=t5e3F31GA8k2ZcEE+EyQ7gjHxAyDOAPbAEdUn7T12/ymgaeZljwHsqjRExAqYK+0Q6FDDP 2jpl5ce5VvwD4PmqL+Y9zeWJM+MBCAWpK2+fmgPSKQomylF5swcpPSbtf0XMf2zCSBB9n+ Q16LAdzqmi/Jlo8tjvJvpFIaiY/GmaejzlygY32bdN4bt2hTYuP8od+mAZ3CLy0n0+E3bA JzfiLAinYjc8dQ12dKUUhCdNnPzaUQBoIYHryERDBZ7lokjUwI7InUCdqsrhRuwgfCOEbz q11nnCOUFEzj55+sR9+VPZfhjavZShoFV+H08nWRneuLBKPLr5D1e0AoQpMv7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9d85b8fa70ac8f61ca189114aafed092fda921 commit 6c9d85b8fa70ac8f61ca189114aafed092fda921 Author: Xin LI AuthorDate: 2022-03-31 22:35:58 +0000 Commit: Xin LI CommitDate: 2022-04-04 00:49:33 +0000 MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC functions. (cherry picked from commit c61bc1110c90cb67a60cb08c4f3bc24f75d0b385) --- sys/contrib/zlib/crc32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/zlib/crc32.c b/sys/contrib/zlib/crc32.c index a1bdce5c23c6..451887bc7ce4 100644 --- a/sys/contrib/zlib/crc32.c +++ b/sys/contrib/zlib/crc32.c @@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) #endif /* DYNAMIC_CRC_TABLE */ /* Pre-condition the CRC */ - crc ^= 0xffffffff; + crc = (~crc) & 0xffffffff; /* Compute the CRC up to a word boundary. */ while (len && ((z_size_t)buf & 7) != 0) { @@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) #endif /* DYNAMIC_CRC_TABLE */ /* Pre-condition the CRC */ - crc ^= 0xffffffff; + crc = (~crc) & 0xffffffff; #ifdef W @@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) #ifdef DYNAMIC_CRC_TABLE once(&made, make_crc_table); #endif /* DYNAMIC_CRC_TABLE */ - return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; + return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); } /* ========================================================================= */ @@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) uLong crc2; uLong op; { - return multmodp(op, crc1) ^ crc2; + return multmodp(op, crc1) ^ (crc2 & 0xffffffff); }