From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Mon, 17 Apr 2023 09:36:30 +0000 (+0200)
Subject: libblkid: erofs: calculate checksum with offset
X-Git-Tag: v2.39-rc3~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d5076d73266ce4a6cf30dd4778bc0485770a5f0;p=thirdparty%2Futil-linux.git

libblkid: erofs: calculate checksum with offset

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/libblkid/src/superblocks/erofs.c b/libblkid/src/superblocks/erofs.c
index c451083c02..14d272efef 100644
--- a/libblkid/src/superblocks/erofs.c
+++ b/libblkid/src/superblocks/erofs.c
@@ -58,8 +58,9 @@ static int erofs_verify_checksum(blkid_probe pr, const struct blkid_idmag *mag,
 	if (!csummed)
 		return 0;
 
-	memset(csummed + offsetof(struct erofs_super_block, checksum), 0, sizeof(uint32_t));
-	csum = crc32c(~0L, csummed, csummed_size);
+	csum = ul_crc32c_exclude_offset(~0L, csummed, csummed_size,
+			                offsetof(struct erofs_super_block, checksum),
+					sizeof_member(struct erofs_super_block, checksum));
 
 	return blkid_probe_verify_csum(pr, csum, expected);
 }