From nobody Mon Apr 04 15:56:59 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 A19271A93A98; Mon, 4 Apr 2022 15:56:59 +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 4KXFlH32bBz4xRs; Mon, 4 Apr 2022 15:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649087819; 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=ThidHK4sMT9bhbx+f6av2UDTxYMVTA6YdpUQeUIYIcs=; b=Yhy01ccA4vnRgsqym+aP2zAQCJfIZa4aHWJ++3rBYtcX2JOBfi+Tvg4LwcHdd0l13DOU3q qPRR7HBZ92Cy4K/eYRuw77ml8aRehC3ENHIeLiIV0PPxHuSRVzIbEc4vzPin0ybWUgkgrj 9EFY3UgGwMXszuwcrRO/prnBmRMyEr4yTTnVfYHEErvHPdz/akWcOnHRLznIUa7mOOSLwX x6SlZLMQ+iMCElszh0Vmht/TcdhvYFVsRE6seAbafnWmtRuF7BBoN0xIxbWUbylCDcOry5 khvU6HQSaT/ukFfnN++32hKkTdLk5jkzpZ9+RhoM5fnnSfdabjzS0ALArnpuqw== 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 32C261519B; Mon, 4 Apr 2022 15:56:59 +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 234FuxlL081330; Mon, 4 Apr 2022 15:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234FuxXO081329; Mon, 4 Apr 2022 15:56:59 GMT (envelope-from git) Date: Mon, 4 Apr 2022 15:56:59 GMT Message-Id: <202204041556.234FuxXO081329@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: 6b0e0c9e9534 - stable/13 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b0e0c9e9534149d932fc8b71d1d21a09fe31ffc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649087819; 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=ThidHK4sMT9bhbx+f6av2UDTxYMVTA6YdpUQeUIYIcs=; b=w0qEFzq1ZXB9d2CSrifVwSPbVzkjZzG3YQMHDNHcbGD/PiFawP3S/Wk5vWLZOhQBcU9p31 Cvq/UOYXWBUzgScBknYaKz1Vn1pfcHVRf3LHLoqOg5cw2iNlib+J94L5PIEVqUEaHxo4ZU Y3cZlz05MvhvE+Hta3jAH+plbybXUsSdrf7sWfecPdPSs3BOrG4Hf1410k4jslzaGHL+Ww eignf3VS0GRbJFM4NFKzkZ0y/i9EJH5EcK6XO9m5sGPF7tvaQwWDXz9G/k3Mn7Qt5OGhZn KAGLzfpEAbCX/EDbFpCVBzuQMYEAR6b3NqerE6y365kuN19ShITO8SzJGxh8hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649087819; a=rsa-sha256; cv=none; b=pLSof0gmWzZVUxBxEXHOp8144sqWshVYPsN+G0WKTVGYXzUdluuV8yUOHOTwZiBPWy/+z7 isDiObtOGRSJftWDp4pKxrvmaYb0rQ809GC6JPeHBVQsU0Wj6pVrQOkzzdhbVCDDpYFgvJ YHCf0i6IrrlsokG7ZZkT4wo5kyy1p7pypWrTFGVVmKfrYECa67rhm1ZGdThltTKkv2d/Hp gYpC4TwBETrVYB7dbx6ocHjqEkgYONNoEBqhciLc+uSAYYTv2CltaAZpwLRXAoy/A+SpPR txW8vojKjKdPweKDE/n88t5rkdSbphQzP1pWS2XmCSMvAEVmHzi5/UhRcv6qzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b0e0c9e9534149d932fc8b71d1d21a09fe31ffc commit 6b0e0c9e9534149d932fc8b71d1d21a09fe31ffc Author: Xin LI AuthorDate: 2022-03-31 22:35:58 +0000 Commit: Ed Maste CommitDate: 2022-04-04 15:31:46 +0000 MFV 7b495a2a7abf (zlib): Correct incorrect inputs provided to the CRC functions. MFC after: 3 days (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); }