git: 8b3a5cdcf05f - releng/13.1 - MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC functions.

The branch releng/13.1 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=8b3a5cdcf05f9129b697868e58773d6d9b854162

commit 8b3a5cdcf05f9129b697868e58773d6d9b854162
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2022-03-31 22:35:58 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-04-04 16:54:11 +0000

    MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC
    functions.
    
    MFC after:      3 days
    
    (cherry picked from commit c61bc1110c90cb67a60cb08c4f3bc24f75d0b385)
    (cherry picked from commit 6b0e0c9e9534149d932fc8b71d1d21a09fe31ffc)
    
    Approved by:    re (gjb)
---
 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);
 }