[Xen-changelog] [xen-unstable] libxl: fail to parse disk vpath if a disk+part number needed but unavailable

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1317223871 -3600
# Node ID 8863be49d31905a81dcbe82071a29fece38c9dc9
# Parent  59c7213b5949e9a2401c60aa5c88726db66112fc
libxl: fail to parse disk vpath if a disk+part number needed but unavailable

libxl__device_disk_dev_number() can parse a virtpath which is an encoded
unsigned long but does not set *pdisk or *ppartition in that case.

Ideally we would parse the number but for now simply fail to prevent cascading
failures.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 59c7213b5949 -r 8863be49d319 tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c        Tue Sep 27 18:39:15 2011 +0100
+++ b/tools/libxl/libxl_device.c        Wed Sep 28 16:31:11 2011 +0100
@@ -341,8 +341,12 @@
 
     errno = 0;
     ul = strtoul(virtpath, &ep, 0);
-    if (!errno && !*ep && ul <= INT_MAX)
+    if (!errno && !*ep && ul <= INT_MAX) {
+        /* FIXME: should parse ul to determine these. */
+        if (pdisk || ppartition)
+            return -1;
         return ul;
+    }
 
     if (device_virtdisk_matches(virtpath, "hd",
                                 &disk, 3,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog