From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Sun, 1 Oct 2023 11:57:43 +0000 (+0200)
Subject: libblkid: (drbd) avoid unaligned accesses
X-Git-Tag: v2.40-rc1~221^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=849eb9df0a07770a9494ce9e0fdceb6a351be1ac;p=thirdparty%2Futil-linux.git

libblkid: (drbd) avoid unaligned accesses

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

diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index 2adf5089b3..baead1d78a 100644
--- a/libblkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
@@ -137,8 +137,8 @@ static int probe_drbd_84(blkid_probe pr, const struct blkid_idmag *mag)
 	 * notion of uuids (64 bit, see struct above)
 	 */
 	blkid_probe_sprintf_uuid(pr,
-		(unsigned char *) &md->device_uuid, sizeof(md->device_uuid),
-		"%" PRIx64, be64_to_cpu(md->device_uuid));
+		member_ptr(md, device_uuid), sizeof(md->device_uuid),
+		"%" PRIx64, be64_to_cpu(read_unaligned_member(md, device_uuid)));
 
 	blkid_probe_set_version(pr, "v08");
 
@@ -158,8 +158,8 @@ static int probe_drbd_90(blkid_probe pr, const struct blkid_idmag *mag)
 	 * notion of uuids (64 bit, see struct above)
 	 */
 	blkid_probe_sprintf_uuid(pr,
-		(unsigned char *) &md->device_uuid, sizeof(md->device_uuid),
-		"%" PRIx64, be64_to_cpu(md->device_uuid));
+		member_ptr(md, device_uuid), sizeof(md->device_uuid),
+		"%" PRIx64, be64_to_cpu(read_unaligned_member(md, device_uuid)));
 
 	blkid_probe_set_version(pr, "v09");