commit 0e87ba2ccbf900cc5a56b95e0671e5a5d2c2f6a0
author Stefan Weil <sw@weilnetz.de> Thu Jan 17 21:45:28 2013 +0100
committer Kevin Wolf <kwolf@redhat.com> Fri Jan 25 18:18:35 2013 +0100
tree 697d3c33b6cd16e2e5c84c9382a68e69f6d3b58a
parent 8937f8222c14ab42140a5645c34e17cc620c05bb

block/vdi: Check for bad signature

vdi_open did not check for a bad signature.
This check was only in vdi_probe.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block/vdi.c

diff --git a/block/vdi.c b/block/vdi.c
index 8b768bf..257a592 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -392,7 +392,11 @@
         header.disk_size &= ~(SECTOR_SIZE - 1);
     }
 
-    if (header.version != VDI_VERSION_1_1) {
+    if (header.signature != VDI_SIGNATURE) {
+        logout("bad vdi signature %08x\n", header.signature);
+        ret = -EMEDIUMTYPE;
+        goto fail;
+    } else if (header.version != VDI_VERSION_1_1) {
         logout("unsupported version %u.%u\n",
                header.version >> 16, header.version & 0xffff);
         ret = -ENOTSUP;