5ef52f56fd
remote NDIS control message handling CVE-2016-2538-qemuu-usb-integer-overflow-in-remote-NDIS-message-handling.patch - Update libxl to recognize dmmd and npiv prefix in disk spec xen.libxl.dmmd.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=403
119 lines
5.2 KiB
Diff
119 lines
5.2 KiB
Diff
References: bsc#954872
|
|
|
|
---
|
|
tools/libxl/libxl.c | 4 ++++
|
|
tools/libxl/libxl_device.c | 3 ++-
|
|
tools/libxl/libxl_dm.c | 34 +++++++++++++++++++++++++++++-----
|
|
tools/libxl/libxlu_disk_l.l | 2 ++
|
|
4 files changed, 37 insertions(+), 6 deletions(-)
|
|
|
|
Index: xen-4.6.1-testing/tools/libxl/libxl.c
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/libxl/libxl.c
|
|
+++ xen-4.6.1-testing/tools/libxl/libxl.c
|
|
@@ -2791,6 +2791,10 @@ static void device_disk_add(libxl__egc *
|
|
/* now create a phy device to export the device to the guest */
|
|
goto do_backend_phy;
|
|
case LIBXL_DISK_BACKEND_QDISK:
|
|
+ if (disk->script) {
|
|
+ script = libxl__abs_path(gc, disk->script, libxl__xen_script_dir_path());
|
|
+ flexarray_append_pair(back, "script", script);
|
|
+ }
|
|
flexarray_append(back, "params");
|
|
flexarray_append(back, libxl__sprintf(gc, "%s:%s",
|
|
libxl__device_disk_string_of_format(disk->format), disk->pdev_path));
|
|
Index: xen-4.6.1-testing/tools/libxl/libxl_device.c
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/libxl/libxl_device.c
|
|
+++ xen-4.6.1-testing/tools/libxl/libxl_device.c
|
|
@@ -235,7 +235,8 @@ static int disk_try_backend(disk_try_bac
|
|
return backend;
|
|
|
|
case LIBXL_DISK_BACKEND_QDISK:
|
|
- if (a->disk->script) goto bad_script;
|
|
+ LOG(DEBUG, "Disk vdev=%s, uses script=%s on %s backend",
|
|
+ a->disk->vdev, a->disk->script, libxl_disk_backend_to_string(backend));
|
|
return backend;
|
|
|
|
default:
|
|
Index: xen-4.6.1-testing/tools/libxl/libxl_dm.c
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/libxl/libxl_dm.c
|
|
+++ xen-4.6.1-testing/tools/libxl/libxl_dm.c
|
|
@@ -700,6 +700,30 @@ static char *dm_spice_options(libxl__gc
|
|
return opt;
|
|
}
|
|
|
|
+static void libxl__suse_node_to_path(libxl__gc *gc, int domid, const libxl_device_disk *dp, const char **pdev_path)
|
|
+{
|
|
+ libxl_ctx *ctx = libxl__gc_owner(gc);
|
|
+ char *be_path, *node;
|
|
+ libxl__device device;
|
|
+ libxl_device_disk disk;
|
|
+ int rc;
|
|
+
|
|
+ disk = *dp;
|
|
+ rc = libxl__device_from_disk(gc, domid, &disk, &device);
|
|
+ if (rc) {
|
|
+ LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "libxl__device_from_disk failed %d", rc);
|
|
+ return;
|
|
+ }
|
|
+ be_path = libxl__device_backend_path(gc, &device);
|
|
+
|
|
+ node = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/node", be_path));
|
|
+ if (!node)
|
|
+ return;
|
|
+
|
|
+ LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "replacing '%s' with '%s' from %s/node, just for qemu-xen", *pdev_path, node, be_path);
|
|
+ *pdev_path = node;
|
|
+}
|
|
+
|
|
static int libxl__build_device_model_args_new(libxl__gc *gc,
|
|
const char *dm, int guest_domid,
|
|
const libxl_domain_config *guest_config,
|
|
@@ -1099,7 +1123,9 @@ static int libxl__build_device_model_arg
|
|
libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
|
|
const char *format = qemu_disk_format_string(disks[i].format);
|
|
char *drive;
|
|
- const char *pdev_path;
|
|
+ const char *pdev_path = disks[i].pdev_path;
|
|
+
|
|
+ libxl__suse_node_to_path(gc, guest_domid, disks + i, &pdev_path);
|
|
|
|
if (dev_number == -1) {
|
|
LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "unable to determine"
|
|
@@ -1115,7 +1141,7 @@ static int libxl__build_device_model_arg
|
|
else
|
|
drive = libxl__sprintf
|
|
(gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i",
|
|
- disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number);
|
|
+ pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number);
|
|
} else {
|
|
if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) {
|
|
LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support"
|
|
@@ -1131,10 +1157,8 @@ static int libxl__build_device_model_arg
|
|
|
|
if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) {
|
|
format = qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW);
|
|
- pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path,
|
|
+ pdev_path = libxl__blktap_devpath(gc, pdev_path,
|
|
disks[i].format);
|
|
- } else {
|
|
- pdev_path = disks[i].pdev_path;
|
|
}
|
|
|
|
/*
|
|
Index: xen-4.6.1-testing/tools/libxl/libxlu_disk_l.l
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/libxl/libxlu_disk_l.l
|
|
+++ xen-4.6.1-testing/tools/libxl/libxlu_disk_l.l
|
|
@@ -210,6 +210,8 @@ target=.* { STRIP(','); SAVESTRING("targ
|
|
free(newscript);
|
|
}
|
|
|
|
+dmmd:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
|
|
+npiv:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
|
|
tapdisk:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
|
|
tap2?:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
|
|
aio:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
|