From: Gianni Tedesco <gianni.tedesco@citrix.com>
Date: Tue, 27 Jul 2010 15:23:04 +0000 (+0100)
Subject: libxl: fix segfault when detaching non-existant disk
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11732
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=646e4efe010ff70d7ef26f118e9648d4446fd4cd;p=xen.git

libxl: fix segfault when detaching non-existant disk

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 2a12d3f070..0dc5bd72e4 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -451,6 +451,8 @@ int libxl_devid_to_device_disk(struct libxl_ctx *ctx, uint32_t domid,
     }
 
     val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/backend-id", diskpath));
+    if (!val)
+        return ERROR_FAIL;
     disk->backend_domid = strtoul(val, NULL, 10);
     disk->domid = domid;
     be_path = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/backend", diskpath));