From: Milan Broz <gmazyland@gmail.com>
Date: Tue, 22 Nov 2022 11:37:11 +0000 (+0100)
Subject: libblkid: fix misaligned-address in probe_erofs
X-Git-Tag: v2.39-rc1~411
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d39c0d89d832278e778f7cff0f355a12fff19cd3;p=thirdparty%2Futil-linux.git

libblkid: fix misaligned-address in probe_erofs

Erofs on-disk superblock struct should be marked as packed
to avoid default struct members alignment.

Fix OSS-Fuzz issue 53615
---

diff --git a/libblkid/src/superblocks/erofs.c b/libblkid/src/superblocks/erofs.c
index 452bb8d3bd..c7dc22db90 100644
--- a/libblkid/src/superblocks/erofs.c
+++ b/libblkid/src/superblocks/erofs.c
@@ -39,7 +39,7 @@ struct erofs_super_block {
 	uint8_t		volume_name[16];
 	uint32_t	feature_incompat;
 	uint8_t		reserved2[44];
-};
+} __attribute__((packed));
 
 static int erofs_verify_checksum(blkid_probe pr, const struct blkid_idmag *mag,
 		const struct erofs_super_block *sb)