X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_raid.c;h=e84557082395cf6ca6700078d92919514367a2fe;hb=387a8271207b4e921258194cf359039babbc33b9;hp=af496584c45cb06e3087816c20f661ef54a85904;hpb=661a0bea80d129d5df708e36dbaed745c9d8392e;p=elogind.git

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index af496584c..e84557082 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 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.
+ * 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>
@@ -25,7 +30,7 @@
 #include <byteswap.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct mdp0_super_block {
 	uint32_t	md_magic;
@@ -67,8 +72,7 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
 		uint8_t bytes[16];
 	} uuid;
 
-	info("probing at offset 0x%llx, size 0x%llx\n",
-	    (unsigned long long) off, (unsigned long long) size);
+	info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
 	if (size < 0x10000)
 		return -1;
 
@@ -122,8 +126,7 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 	const uint8_t *buf;
 	struct mdp1_super_block *mdp1;
 
-	info("probing at offset 0x%llx, size 0x%llx\n",
-	    (unsigned long long) off, (unsigned long long) size);
+	info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
 
 	buf = volume_id_get_buffer(id, off, 0x800);
 	if (buf == NULL)
@@ -148,26 +151,31 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
 {
 	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)
-		strcpy(id->type_version, "1.0");
+	if (size > MD_RESERVED_BYTES) {
+		/* 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) {
+			strcpy(id->type_version, "1.0");
+			return 0;
+		}
+	}
 
 	/* version 1.1 at the start of the device */
-	else if (volume_id_probe_linux_raid1(id, off, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off, size) == 0) {
 		strcpy(id->type_version, "1.1");
+		return 0;
+	}
 
 	/* version 1.2 at 4k offset from the start */
-	else if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+	if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
 		strcpy(id->type_version, "1.2");
+		return 0;
+	}
 
-	else
-		return -1;
-
-	return 0;
+	return -1;
 }