File 589b3272-libxl-dont-segfault-when-creating-doma... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File 589b3272-libxl-dont-segfault-when-creating-domain-with-invalid-pvusb-device.patch of Package xen (Revision 6bbfc10fa0cd4906a4b565a5ad40b57f)

Currently displaying revision 6bbfc10fa0cd4906a4b565a5ad40b57f , Show latest

Subject: libxl: don't segfault when creating domain with invalid pvusb device
From: Juergen Gross jgross@suse.com Wed Feb 8 14:34:08 2017 +0100
Date: Wed Feb 8 15:00:02 2017 +0000:
Git: 58b4db0832de1ee355a342feea7e1545219bef12

Creating a domain with an invalid controller specification for a pvusb
device will currently segfault.

Avoid this by bailing out early in case of a mandatory xenstore path
not existing.

Signed-of-by: Juergen Gross <jgross@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

Index: xen-4.8.0-testing/tools/libxl/libxl_internal.h
===================================================================
--- xen-4.8.0-testing.orig/tools/libxl/libxl_internal.h
+++ xen-4.8.0-testing/tools/libxl/libxl_internal.h
@@ -727,6 +727,13 @@ int libxl__xs_mknod(libxl__gc *gc, xs_tr
 
 /* On success, *result_out came from the gc.
  * On error, *result_out is undefined.
+ * ENOENT is regarded as error.
+ */
+int libxl__xs_read_mandatory(libxl__gc *gc, xs_transaction_t t,
+                             const char *path, const char **result_out);
+
+/* On success, *result_out came from the gc.
+ * On error, *result_out is undefined.
  * ENOENT counts as success but sets *result_out=0
  */
 int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t,
Index: xen-4.8.0-testing/tools/libxl/libxl_usb.c
===================================================================
--- xen-4.8.0-testing.orig/tools/libxl/libxl_usb.c
+++ xen-4.8.0-testing/tools/libxl/libxl_usb.c
@@ -652,9 +652,9 @@ int libxl_device_usbctrl_getinfo(libxl_c
     usbctrlinfo->devid = usbctrl->devid;
 
 #define READ_SUBPATH(path, subpath) ({                                  \
-        rc = libxl__xs_read_checked(gc, XBT_NULL,                       \
-                                    GCSPRINTF("%s/" subpath, path),     \
-                                    &tmp);                              \
+        rc = libxl__xs_read_mandatory(gc, XBT_NULL,                     \
+                                      GCSPRINTF("%s/" subpath, path),   \
+                                      &tmp);                            \
         if (rc) goto out;                                               \
         (char *)tmp;                                                    \
     })
Index: xen-4.8.0-testing/tools/libxl/libxl_xshelp.c
===================================================================
--- xen-4.8.0-testing.orig/tools/libxl/libxl_xshelp.c
+++ xen-4.8.0-testing/tools/libxl/libxl_xshelp.c
@@ -193,6 +193,18 @@ char *libxl__xs_libxl_path(libxl__gc *gc
     return s;
 }
 
+int libxl__xs_read_mandatory(libxl__gc *gc, xs_transaction_t t,
+                             const char *path, const char **result_out)
+{
+    char *result = libxl__xs_read(gc, t, path);
+    if (!result) {
+        LOGE(ERROR, "xenstore read failed: `%s'", path);
+        return ERROR_FAIL;
+    }
+    *result_out = result;
+    return 0;
+}
+
 int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t,
                            const char *path, const char **result_out)
 {

Places

File 589b3272-libxl-dont-segfault-when-creating-domain-with-invalid-pvusb-device.patch of Package xen (Revision 6bbfc10fa0cd4906a4b565a5ad40b57f)

Places