volume_id: support via raid version 2

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

diff --git a/extras/volume_id/lib/via_raid.c b/extras/volume_id/lib/via_raid.c
index 42cb0980651ad46ca6d1a2bc7eb63e9d01afc50a..2d022a00600a2f1b43008b2ad464b940e3f56821 100644 (file)
--- a/extras/volume_id/lib/via_raid.c
+++ b/extras/volume_id/lib/via_raid.c
@@ -3,19 +3,27 @@
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
+ * Based on information taken from dmraid:
+ * Copyright (C) 2004-2006 Heinz Mauelshagen, Red Hat GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,13 +32,13 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct via_meta {
        uint16_t        signature;
        uint8_t         version_number;
        struct via_array {
-               uint16_t        disk_bits;
+               uint16_t        disk_bit_mask;
                uint8_t         disk_array_ex;
                uint32_t        capacity_low;
                uint32_t        capacity_high;
@@ -42,14 +50,25 @@ struct via_meta {
 
 #define VIA_SIGNATURE          0xAA55
 
+/* 8 bit checksum on first 50 bytes of metadata. */
+static uint8_t meta_checksum(struct via_meta *via)
+{
+       uint8_t i = 50, sum = 0;
+
+       while (i--)
+               sum += ((uint8_t*) via)[i];
+
+       return sum == via->checksum;
+}
+
+
 int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
        const uint8_t *buf;
        uint64_t meta_off;
        struct via_meta *via;
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
-           (unsigned long long) off, (unsigned long long) size);
+       dbg("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
 
        if (size < 0x10000)
                return -1;
@@ -64,7 +83,10 @@ int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size)
        if (le16_to_cpu(via->signature) !=  VIA_SIGNATURE)
                return -1;
 
-       if (via->version_number > 1)
+       if (via->version_number > 2)
+               return -1;
+
+       if (!meta_checksum(via))
                return -1;
 
        volume_id_set_usage(id, VOLUME_ID_RAID);