47 lines
1.6 KiB
Plaintext
47 lines
1.6 KiB
Plaintext
$NetBSD: patch-CVE-2015-2152,v 1.1 2015/03/13 09:43:41 spz Exp $
|
|
|
|
patch for XSA-119 aka CVE-2015-2152 from
|
|
http://xenbits.xen.org/xsa/xsa119-4.2.patch
|
|
fixing
|
|
HVM qemu unexpectedly enabling emulated VGA graphics backends
|
|
|
|
--- libxl/libxl_dm.c.orig 2014-09-02 06:22:57.000000000 +0000
|
|
+++ libxl/libxl_dm.c
|
|
@@ -147,7 +147,15 @@ static char ** libxl__build_device_model
|
|
if (libxl_defbool_val(vnc->findunused)) {
|
|
flexarray_append(dm_args, "-vncunused");
|
|
}
|
|
- }
|
|
+ } else
|
|
+ /*
|
|
+ * VNC is not enabled by default by qemu-xen-traditional,
|
|
+ * however passing -vnc none causes SDL to not be
|
|
+ * (unexpectedly) enabled by default. This is overridden by
|
|
+ * explicitly passing -sdl below as required.
|
|
+ */
|
|
+ flexarray_append_pair(dm_args, "-vnc", "none");
|
|
+
|
|
if (sdl) {
|
|
flexarray_append(dm_args, "-sdl");
|
|
if (!libxl_defbool_val(sdl->opengl)) {
|
|
@@ -394,7 +402,18 @@ static char ** libxl__build_device_model
|
|
vncarg = libxl__sprintf(gc, "%s,to=99", vncarg);
|
|
}
|
|
flexarray_append(dm_args, vncarg);
|
|
- }
|
|
+ } else
|
|
+ /*
|
|
+ * Ensure that by default no vnc server is created.
|
|
+ */
|
|
+ flexarray_append_pair(dm_args, "-vnc", "none");
|
|
+
|
|
+ /*
|
|
+ * Ensure that by default no display backend is created. Further
|
|
+ * options given below might then enable more.
|
|
+ */
|
|
+ flexarray_append_pair(dm_args, "-display", "none");
|
|
+
|
|
if (sdl) {
|
|
flexarray_append(dm_args, "-sdl");
|
|
/* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */
|