btrfs-progs: Fix xxhash on big endian machines
Subsystems (2)
PATCH 1/1 btrfs-progs: Fix xxhash on big endian machines
xxhash's state and results are always in little, but in progs after the hash was calculated it was copied to the final buffer via memcpy, meaning it'd be parsed as a big endian number on big endian machines. This is incompatible with the kernel implementation of xxhash which results in erroneous "checksum didn't match" errors on mount.
Fix it by using put_unaligned_le64 which always ensures the resulting checksum will be copied in little endian format as the kernel expects it.
--- crypto/hash.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
crypto/hash.c +1 -6
@@ -19,12 +19,7 @@ int hash_xxhash(const u8 *buf, size_t length, u8 *out)XXH64_hash_t hash; hash =XXH64 (buf, length,0 ); -/* -* NOTE: we're not taking the canonical form here but the plain hash to -* be compatible with the kernel implementation! -*/ -memcpy (out, &hash,8 ); - +put_unaligned_le64 (&hash, out);return 0 ; }
--
2.17.1
Looks good,
Quoted 6 lines · Nikolay Borisov
xxhash's state and results are always in little, but in progs after the hash was calculated it was copied to the final buffer via memcpy, meaning it'd be parsed as a big endian number on big endian machines. This is incompatible with the kernel implementation of xxhash which results in erroneous "checksum didn't match" errors on mount.
Quoted 7 lines
Fix it by using
put_unaligned_le64which always ensures the resulting checksum will be copied in little endian format as the kernel expects it.Fixes f070ece2e98f ("btrfs-progs: add xxhash64 to mkfs")Signed-off-by Nikolay Borisov <[email protected]>
Added to devel, thanks.
Quoted 22 lines · Nikolay Borisov
xxhash's state and results are always in little, but in progs after the hash was calculated it was copied to the final buffer via memcpy, meaning it'd be parsed as a big endian number on big endian machines. This is incompatible with the kernel implementation of xxhash which results in erroneous "checksum didn't match" errors on mount.
Fix it by using
put_unaligned_le64which always ensures the resulting checksum will be copied in little endian format as the kernel expects it.Fixes f070ece2e98f ("btrfs-progs: add xxhash64 to mkfs")Signed-off-by Nikolay Borisov <[email protected]>--- crypto/hash.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)crypto/hash.c +0
-0
crypto/hash.c int hash_xxhash(const u8 *buf, size_t length, u8 *out) · line 22
Quoted 10 lines
crypto/hash.c +1
-6@@ -19,12 +19,7 @@ int hash_xxhash(const u8 *buf, size_t length, u8 *out)XXH64_hash_t hash; hash =XXH64 (buf, length,0 ); -/* -* NOTE: we're not taking the canonical form here but the plain hash to -* be compatible with the kernel implementation! -*/ -memcpy (out, &hash,8 ); - +put_unaligned_le64 (&hash, out);
This does not work, the test mkfs/019 fails.