9e9b5acb9c
5604f239-x86-PV-properly-populate-descriptor-tables.patch 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-0.patch 561d2046-VT-d-use-proper-error-codes-in-iommu_enable_x2apic_IR.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-handling.patch - bsc#951845 - VUL-0: CVE-2015-7972: xen: x86: populate-on-demand balloon size inaccuracy can crash guests (XSA-153) xsa153-libxl.patch - bsc#950703 - VUL-1: CVE-2015-7969: xen: leak of main per-domain vcpu pointer array (DoS) (XSA-149) xsa149.patch - bsc#950705 - VUL-1: CVE-2015-7969: xen: x86: leak of per-domain profiling-related vcpu pointer array (DoS) (XSA-151) xsa151.patch - bsc#950706 - VUL-0: CVE-2015-7971: xen: x86: some pmu and profiling hypercalls log without rate limiting (XSA-152) xsa152.patch - Dropped 55dc7937-x86-IO-APIC-don-t-create-pIRQ-mapping-from-masked-RTE.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch - bsc#932267 - VUL-1: CVE-2015-4037: qemu,kvm,xen: insecure temporary file use in /net/slirp.c CVE-2015-4037-qemuu-smb-config-dir-name.patch CVE-2015-4037-qemut-smb-config-dir-name.patch - bsc#877642 - VUL-0: CVE-2014-0222: qemu: qcow1: validate L2 table size to avoid integer overflows OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=382
86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
Index: xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/net.h
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/tools/qemu-xen-traditional-dir-remote/net.h
|
|
+++ xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/net.h
|
|
@@ -107,8 +107,8 @@ void net_host_device_add(const char *dev
|
|
void net_host_device_remove(int vlan_id, const char *device);
|
|
|
|
#ifndef DEFAULT_NETWORK_SCRIPT
|
|
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
|
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
|
+#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
|
|
+#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/qemu-ifdown"
|
|
#endif
|
|
#ifdef __sun__
|
|
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
|
|
Index: xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/net.c
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/tools/qemu-xen-traditional-dir-remote/net.c
|
|
+++ xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/net.c
|
|
@@ -1765,9 +1765,10 @@ int net_client_init(const char *device,
|
|
}
|
|
if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
|
|
get_param_value(script_arg, sizeof(script_arg), "bridge", p) == 0) { /* deprecated; for xend compatibility */
|
|
- pstrcpy(script_arg, sizeof(script_arg), "");
|
|
+ ret = net_tap_init(vlan, device, name, ifname, setup_script, NULL, NULL);
|
|
+ } else {
|
|
+ ret = net_tap_init(vlan, device, name, ifname, setup_script, down_script, script_arg);
|
|
}
|
|
- ret = net_tap_init(vlan, device, name, ifname, setup_script, down_script, script_arg);
|
|
}
|
|
} else
|
|
#endif
|
|
Index: xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
+++ xen-4.5.1-testing/tools/qemu-xen-traditional-dir-remote/i386-dm/qemu-ifup-Linux
|
|
@@ -1,36 +1,22 @@
|
|
#!/bin/sh
|
|
|
|
-#. /etc/rc.d/init.d/functions
|
|
-#ulimit -c unlimited
|
|
-
|
|
echo 'config qemu network with xen bridge for ' $*
|
|
|
|
+# If bridge is not specified, try device with default route.
|
|
bridge=$2
|
|
+if [ -z "$bridge" ]; then
|
|
+ bridge=$(ip route list | awk '/^default / { print $NF }')
|
|
+fi
|
|
|
|
-#
|
|
-# Old style bridge setup with netloop, used to have a bridge name
|
|
-# of xenbrX, enslaving pethX and vif0.X, and then configuring
|
|
-# eth0.
|
|
-#
|
|
-# New style bridge setup does not use netloop, so the bridge name
|
|
-# is ethX and the physical device is enslaved pethX
|
|
-#
|
|
-# So if...
|
|
-#
|
|
-# - User asks for xenbrX
|
|
-# - AND xenbrX doesn't exist
|
|
-# - AND there is a ethX device which is a bridge
|
|
-#
|
|
-# ..then we translate xenbrX to ethX
|
|
-#
|
|
-# This lets old config files work without modification
|
|
-#
|
|
-if [ ! -e "/sys/class/net/$bridge" ] && [ -z "${bridge##xenbr*}" ]
|
|
+# Exit if $bridge is not a bridge. Exit with 0 status
|
|
+# so qemu-dm process is not terminated. No networking in
|
|
+# vm is bad but not catastrophic. The vm could still run
|
|
+# cpu and disk IO workloads.
|
|
+# Include an useful error message in qemu-dm log file.
|
|
+if [ ! -e "/sys/class/net/${bridge}/bridge" ]
|
|
then
|
|
- if [ -e "/sys/class/net/eth${bridge#xenbr}/bridge" ]
|
|
- then
|
|
- bridge="eth${bridge#xenbr}"
|
|
- fi
|
|
+ echo "WARNING! ${bridge} is not a bridge. qemu-ifup exiting. VM may not have a functioning networking stack."
|
|
+ exit 0
|
|
fi
|
|
|
|
ifconfig $1 0.0.0.0 up
|