From nobody Mon Apr 04 17:24:38 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 EB22B1A86E09; Mon, 4 Apr 2022 17:24:38 +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 4KXHhQ52Wpz3DTC; Mon, 4 Apr 2022 17:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649093078; 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=0sloOMLbVTD1bmN6f9AaAdFCX5Jtzx9yVI9936SzapI=; b=Ux6daLu1gMKirCl7nFNdtiyTak0iYc8JTI5TiTOsfHu8jvAvAUBX4SK1V424dNV+2DvrYo MV/d1DqOwEEL0qKJaan3EnO5/CkboOCmdGVRayXhWP62NdJTn50rJYEe2FI2AQta8XOfW+ UvJ/fzOzhQcSOA5Gh3prunIiyCg65CtskNo1L4ouq0QiLdQAJqZNOgI6JdxPR3f9ktJBsA sSCep43i1rrpxN4ww/0HFvILUvq7udw6c1GmHWK/fFm9MkAfDzXDGhs1a4Y0TreA1BWaba TWrt7ZAUOSx5Vd2Fyc4DVJaCpHnfslVUNleFflaC3/UgMfJZFpHcqkUe1hsGHA== 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 8305C16431; Mon, 4 Apr 2022 17:24:38 +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 234HOc4Y002639; Mon, 4 Apr 2022 17:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234HOc3T002638; Mon, 4 Apr 2022 17:24:38 GMT (envelope-from git) Date: Mon, 4 Apr 2022 17:24:38 GMT Message-Id: <202204041724.234HOc3T002638@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: 8b3a5cdcf05f - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 8b3a5cdcf05f9129b697868e58773d6d9b854162 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649093078; 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=0sloOMLbVTD1bmN6f9AaAdFCX5Jtzx9yVI9936SzapI=; b=pS3nwGdEUpdFegj4ke0w2iJUgSuk3ReTEQswgKLzTuVX9IAEzN1OYmkzyXujjDLwcEIXHp Mba/H/3F7pS8v6b2enmlN0bR0KQdy6nxvN5I5qZ+E5V2hjW12e4I54jN5WBJAbRoS/l2N6 DvvK6Xn7szW6d4MPDhZO98UElLWYTlmG9T9xtEsn+z8g+7E1HpmZoZ+9pdphOEdBsgLWWI cID+jCM3wZThTfRcyYL547tUBzw8Gilw+b4JwTv2SPV6/wRnnn/6Jo8p+xuRGxgHZJWFKJ q2ik+2I413o4SnpPqPKAOpvPOv50JaEoH9feuuCsmLHgGzumE7b4b4ILy0cq3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649093078; a=rsa-sha256; cv=none; b=nWWA0QF+AhsVLO8boEzZqPru8+/L8TWgK29kswTXIWVfyJWRKgfqeEeZSPuhpPhH49Wd2W wO32Hyj1zcxYhr1Ejy75KQxJxk525alO7t1UrB0b1pBpz8100yrWimhGt7IBkCo4ViwkhC OK7BUZ+ewPl6xgr8dHdtvx391/9Pd7q8Rb0qaH1sJ3rG6C6ynuG4xYmfyG8+AUhCgPNYow O/Q8xrv8mQZf4Da2HBWcDsLy1z5RkoktLH5I+6dzm4a4tnDl+bAZYjoN2Q9L78viMzsgzi 6rq2WCbHyMsf2AVizC4aKCbb5ZvuunGDjEJLzxX3cPoeHI2WgM9/BQWZeH9eYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8b3a5cdcf05f9129b697868e58773d6d9b854162 commit 8b3a5cdcf05f9129b697868e58773d6d9b854162 Author: Xin LI AuthorDate: 2022-03-31 22:35:58 +0000 Commit: Ed Maste 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); }