summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-09-06 16:23:21 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-09-06 16:23:21 +0200
commit7643819062985d9fc6c7664072576e71d3822b10 (patch)
tree13daaa7781bf9668b6600157b9cfb1c0a2f01ad7
parent7d563a17f3967890331daf08d43f2f005418139b (diff)
volume_id: linux_raid - fix logic for volumes with size == 0
-rw-r--r--extras/volume_id/lib/linux_raid.c35
1 files changed, 20 insertions, 15 deletions
diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 5d95b502e3..c40f3e3ba6 100644
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -149,26 +149,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;
}