volume_id: fix linux_raid metadata version 1.0 detection

[elogind.git] / extras / volume_id / lib / linux_raid.c

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 009c714bd1d54fb8445e334f80f891f28bb5425a..ff2c47c4732f0a4f39f6c3a6cbff84c09d2187c1 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -78,20 +78,32 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
 
        if (le32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
                uuid.ints[0] = bswap_32(mdp0->set_uuid0);
-               uuid.ints[1] = bswap_32(mdp0->set_uuid1);
-               uuid.ints[2] = bswap_32(mdp0->set_uuid2);
-               uuid.ints[3] = bswap_32(mdp0->set_uuid3);
-               volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
+               if (le32_to_cpu(mdp0->minor_version >= 90)) {
+                       uuid.ints[1] = bswap_32(mdp0->set_uuid1);
+                       uuid.ints[2] = bswap_32(mdp0->set_uuid2);
+                       uuid.ints[3] = bswap_32(mdp0->set_uuid3);
+               } else {
+                       uuid.ints[1] = 0;
+                       uuid.ints[2] = 0;
+                       uuid.ints[3] = 0;
+               }
+               volume_id_set_uuid(id, uuid.bytes, 0, UUID_FOURINT);
                snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                         le32_to_cpu(mdp0->major_version),
                         le32_to_cpu(mdp0->minor_version),
                         le32_to_cpu(mdp0->patch_version));
        } else if (be32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
                uuid.ints[0] = mdp0->set_uuid0;
-               uuid.ints[1] = mdp0->set_uuid1;
-               uuid.ints[2] = mdp0->set_uuid2;
-               uuid.ints[3] = mdp0->set_uuid3;
-               volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
+               if (be32_to_cpu(mdp0->minor_version >= 90)) {
+                       uuid.ints[1] = mdp0->set_uuid1;
+                       uuid.ints[2] = mdp0->set_uuid2;
+                       uuid.ints[3] = mdp0->set_uuid3;
+               } else {
+                       uuid.ints[1] = 0;
+                       uuid.ints[2] = 0;
+                       uuid.ints[3] = 0;
+               }
+               volume_id_set_uuid(id, uuid.bytes, 0, UUID_FOURINT);
                snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                         be32_to_cpu(mdp0->major_version),
                         be32_to_cpu(mdp0->minor_version),
@@ -119,7 +131,7 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
        if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC)
                return -1;
 
-       volume_id_set_uuid(id, mdp1->set_uuid, UUID_DCE);
+       volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_FOURINT);
        volume_id_set_label_raw(id, mdp1->set_name, 32);
        volume_id_set_label_string(id, mdp1->set_name, 32);
        snprintf(id->type_version, sizeof(id->type_version)-1, "%u", le32_to_cpu(mdp1->major_version));
@@ -130,13 +142,15 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-       uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+       uint64_t sboff;
 
        /* version 0 at the end of the device */
+       sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
        if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
                return 0;
 
        /* version 1.0 at the end of the device */
+       sboff = (size & ~(0x1000 - 1)) - 0x2000;
        if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
                return 0;