From: Paul Eggert Date: Mon, 17 Feb 2025 10:27:09 +0000 (-0800) Subject: cksum: port to 32-bit uint_fast32_t X-Git-Tag: v9.7~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eada35b4fbb48e7fe430d1b18dae7d191f84f8e;p=thirdparty%2Fcoreutils.git cksum: port to 32-bit uint_fast32_t * src/cksum_vmull.c (cksum_vmull): Don’t assume uint_fast32_t can hold 64 bits. Problem reported by Alyssa Ross (Bug#76360). --- diff --git a/NEWS b/NEWS index c6edf16d41..981ffa7b43 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,9 @@ GNU coreutils NEWS -*- outline -*- output are the same terminal device and the output is append-only. [bug introduced in coreutils-9.6] + 'cksum -a crc' misbehaved on aarch64 with 32-bit uint_fast32_t. + [bug introduced in coreutils-9.6] + 'ls -Z dir' would crash. [bug introduced in coreutils-9.6] diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c index 7611c42440..0ff81e225d 100644 --- a/src/cksum_vmull.c +++ b/src/cksum_vmull.c @@ -92,7 +92,9 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) data = bswap_neon (data); /* XOR in initial CRC value (for us 0 so no effect), or CRC value calculated for previous BUFLEN buffer from fread */ - xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); + + uint64_t wcrc = crc; + xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); crc = 0; data = veorq_u64 (data, xor_crc); data3 = vld1q_u64 ((uint64_t *) (datap + 1)); @@ -193,7 +195,8 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) { data = vld1q_u64 ((uint64_t *) (datap)); data = bswap_neon (data); - xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); + uint64_t wcrc = crc; + xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); crc = 0; data = veorq_u64 (data, xor_crc); while (bytes_read >= 32)