From: Nigel Croxon Date: Tue, 24 Sep 2019 15:39:24 +0000 (-0400) Subject: mdadm: force a uuid swap on big endian X-Git-Tag: mdadm-4.2-rc1~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2d9c48d2daf0d78d20494c3779c0f6dc4bfa75;p=thirdparty%2Fmdadm.git mdadm: force a uuid swap on big endian The code path for metadata 0.90 calls a common routine fname_from_uuid that uses metadata 1.2. The code expects member swapuuid to be setup and usable. But it is only setup when using metadata 1.2. Since the metadata 0.90 did not create swapuuid and set it. The test (st->ss == &super1) ? 1 : st->ss->swapuuid fails. The swapuuid is set at compile time based on byte order. Any call based on metadata 0.90 and on big endian processors, the --export uuid will be incorrect. Signed-Off-by: Nigel Croxon Signed-off-by: Jes Sorensen --- diff --git a/util.c b/util.c index c26cf5f3..64dd409c 100644 --- a/util.c +++ b/util.c @@ -685,8 +685,12 @@ char *fname_from_uuid(struct supertype *st, struct mdinfo *info, // work, but can't have it set if we want this printout to match // all the other uuid printouts in super1.c, so we force swapuuid // to 1 to make our printout match the rest of super1 +#if __BYTE_ORDER == BIG_ENDIAN + return __fname_from_uuid(info->uuid, 1, buf, sep); +#else return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep); +#endif } int check_ext2(int fd, char *name)