diff --git a/0005-libxl-Load-guest-BIOS-from-file.patch b/0005-libxl-Load-guest-BIOS-from-file.patch index 1493b50..6d2b766 100644 --- a/0005-libxl-Load-guest-BIOS-from-file.patch +++ b/0005-libxl-Load-guest-BIOS-from-file.patch @@ -177,7 +177,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.7.0-testing/tools/libxl/libxl_types.idl -@@ -512,6 +512,7 @@ libxl_domain_build_info = Struct("domain +@@ -513,6 +513,7 @@ libxl_domain_build_info = Struct("domain ("timer_mode", libxl_timer_mode), ("nested_hvm", libxl_defbool), ("altp2m", libxl_defbool), diff --git a/CVE-2016-4439-qemut-scsi-esp-OOB-write-while-writing-to-cmdbuf-in-esp_reg_write.patch b/CVE-2016-4439-qemut-scsi-esp-OOB-write-while-writing-to-cmdbuf-in-esp_reg_write.patch index a9e9441..6fb4c8a 100644 --- a/CVE-2016-4439-qemut-scsi-esp-OOB-write-while-writing-to-cmdbuf-in-esp_reg_write.patch +++ b/CVE-2016-4439-qemut-scsi-esp-OOB-write-while-writing-to-cmdbuf-in-esp_reg_write.patch @@ -14,10 +14,10 @@ Signed-off-by: Prasad J Pandit hw/scsi/esp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -Index: xen-4.7.0-testing/tools/qemu-xen-traditional-dir-remote/hw/esp.c +Index: xen-4.4.4-testing/tools/qemu-xen-traditional-dir-remote/hw/esp.c =================================================================== ---- xen-4.7.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/esp.c -+++ xen-4.7.0-testing/tools/qemu-xen-traditional-dir-remote/hw/esp.c +--- xen-4.4.4-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/esp.c ++++ xen-4.4.4-testing/tools/qemu-xen-traditional-dir-remote/hw/esp.c @@ -471,7 +471,11 @@ static void esp_mem_writeb(void *opaque, break; case ESP_FIFO: diff --git a/VNC-Support-for-ExtendedKeyEvent-client-message.patch b/VNC-Support-for-ExtendedKeyEvent-client-message.patch index 436ae49..6a1cfe8 100644 --- a/VNC-Support-for-ExtendedKeyEvent-client-message.patch +++ b/VNC-Support-for-ExtendedKeyEvent-client-message.patch @@ -20,10 +20,10 @@ git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5076 c046a42c-6fe2-441c-8c8 vnc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 9 deletions(-) -Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vnc.c +Index: xen-4.7.0-testing/tools/qemu-xen-traditional-dir-remote/vnc.c =================================================================== ---- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/vnc.c -+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vnc.c +--- xen-4.7.0-testing.orig/tools/qemu-xen-traditional-dir-remote/vnc.c ++++ xen-4.7.0-testing/tools/qemu-xen-traditional-dir-remote/vnc.c @@ -1285,35 +1285,22 @@ static void press_key_altgr_down(VncStat } } @@ -140,7 +140,7 @@ Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vnc.c default: printf("Msg: %d\n", data[0]); vnc_client_error(vs); -@@ -2461,10 +2496,11 @@ void vnc_display_init(DisplayState *ds) +@@ -2486,10 +2521,11 @@ void vnc_display_init(DisplayState *ds) vs->ds = ds; diff --git a/ipxe.tar.bz2 b/ipxe.tar.bz2 index 20bd50b..b4f59b9 100644 --- a/ipxe.tar.bz2 +++ b/ipxe.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aea6bddfb9f29223de59da9be509f77a27837ff7f6d68750323b3c3be414cf3a -size 2877672 +oid sha256:7f7466ee1dd84c86ee614b8d32313e1bcfcfbe4b394c14209b6fc32552bed334 +size 2877765 diff --git a/libxl.pvscsi.patch b/libxl.pvscsi.patch index 785fb4d..ed08e80 100644 --- a/libxl.pvscsi.patch +++ b/libxl.pvscsi.patch @@ -105,7 +105,7 @@ Index: xen-4.7.0-testing/docs/man/xl.pod.1 =================================================================== --- xen-4.7.0-testing.orig/docs/man/xl.pod.1 +++ xen-4.7.0-testing/docs/man/xl.pod.1 -@@ -1417,6 +1417,24 @@ List virtual trusted platform modules fo +@@ -1423,6 +1423,24 @@ List virtual trusted platform modules fo =back @@ -154,7 +154,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl.c +++ xen-4.7.0-testing/tools/libxl/libxl.c -@@ -4325,6 +4325,7 @@ DEFINE_DEVICE_REMOVE_CUSTOM(usbctrl, des +@@ -4326,6 +4326,7 @@ DEFINE_DEVICE_REMOVE_CUSTOM(usbctrl, des /* The following functions are defined: * libxl_device_disk_add * libxl_device_nic_add @@ -162,7 +162,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c * libxl_device_vtpm_add * libxl_device_usbctrl_add * libxl_device_usbdev_add -@@ -4356,6 +4357,9 @@ DEFINE_DEVICE_ADD(disk) +@@ -4357,6 +4358,9 @@ DEFINE_DEVICE_ADD(disk) /* nic */ DEFINE_DEVICE_ADD(nic) @@ -172,7 +172,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c /* vtpm */ DEFINE_DEVICE_ADD(vtpm) -@@ -7308,6 +7312,11 @@ int libxl_retrieve_domain_configuration( +@@ -7309,6 +7313,11 @@ int libxl_retrieve_domain_configuration( MERGE(nic, nics, COMPARE_DEVID, {}); @@ -257,7 +257,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_create.c static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, int ret); static void domcreate_attach_usbctrls(libxl__egc *egc, -@@ -1431,13 +1433,13 @@ static void domcreate_devmodel_started(l +@@ -1432,13 +1434,13 @@ static void domcreate_devmodel_started(l if (d_config->num_nics > 0) { /* Attach nics */ libxl__multidev_begin(ao, &dcs->multidev); @@ -273,7 +273,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_create.c return; error_out: -@@ -1445,7 +1447,7 @@ error_out: +@@ -1446,7 +1448,7 @@ error_out: domcreate_complete(egc, dcs, ret); } @@ -282,7 +282,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_create.c libxl__multidev *multidev, int ret) { -@@ -1460,6 +1462,39 @@ static void domcreate_attach_vtpms(libxl +@@ -1461,6 +1463,39 @@ static void domcreate_attach_vtpms(libxl goto error_out; } @@ -372,7 +372,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.7.0-testing/tools/libxl/libxl_types.idl -@@ -697,6 +697,43 @@ libxl_device_channel = Struct("device_ch +@@ -698,6 +698,43 @@ libxl_device_channel = Struct("device_ch ])), ]) @@ -416,7 +416,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl libxl_domain_config = Struct("domain_config", [ ("c_info", libxl_domain_create_info), ("b_info", libxl_domain_build_info), -@@ -708,6 +745,7 @@ libxl_domain_config = Struct("domain_con +@@ -709,6 +746,7 @@ libxl_domain_config = Struct("domain_con ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), @@ -424,7 +424,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), # a channel manifests as a console with a name, # see docs/misc/channels.txt -@@ -745,6 +783,21 @@ libxl_nicinfo = Struct("nicinfo", [ +@@ -746,6 +784,21 @@ libxl_nicinfo = Struct("nicinfo", [ ("rref_rx", integer), ], dir=DIR_OUT) diff --git a/mini-os.tar.bz2 b/mini-os.tar.bz2 index def33e8..fec435e 100644 --- a/mini-os.tar.bz2 +++ b/mini-os.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8725d99ce7d99da1de4d5103b4771a7631651d5cbf6175c3d3d8f73e26570e85 -size 256422 +oid sha256:436ec6bfe55880d69677fdba7c5c1a50a88d7cbd2781574845488455550d5256 +size 255793 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index a58a717..4dfaeb6 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ffbb3f44ab3e7c46ced2220bb6ce8e3e74134d7361125588fb139d5ae93c2b -size 3237104 +oid sha256:54cfea54f25455c6c81a20612fac0299891eac7cbce15a44d03c9696a9eb9cb0 +size 3237789 diff --git a/stubdom.tar.bz2 b/stubdom.tar.bz2 index 759542b..befbe6a 100644 --- a/stubdom.tar.bz2 +++ b/stubdom.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f3cc7ca550b63e67b699f9cc912560c371c459b0f5a91a810a8790fae3458a8 -size 17477344 +oid sha256:2ee40d136161727460051051a7c5fbfc6ebdc16391dce5ea43db6756a768301b +size 17477603 diff --git a/xen-4.7.0-testing-src.tar.bz2 b/xen-4.7.0-testing-src.tar.bz2 index 5882402..af76c29 100644 --- a/xen-4.7.0-testing-src.tar.bz2 +++ b/xen-4.7.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1201ecad0af4fc7b88814b0539c83aa8bb2ef110d9ae8283f6de2a6645045c36 -size 4466035 +oid sha256:dd0d35cd73eb363317bdbda1a9e1900393451ab4e5069b7c142512a6a368902d +size 4465975 diff --git a/xen.changes b/xen.changes index 7be4c3b..53dd8b1 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue May 25 08:54:54 MDT 2016 - carnold@suse.com + +- fate#319989 - Update to Xen 4.7 RC4 + xen-4.7.0-testing-src.tar.bz2 +- Dropped + xen.pkgconfig-4.7.patch + xsa164.patch + ------------------------------------------------------------------- Mon May 23 15:24:35 MDT 2016 - carnold@suse.com diff --git a/xen.pkgconfig-4.7.patch b/xen.pkgconfig-4.7.patch deleted file mode 100644 index 4db4718..0000000 --- a/xen.pkgconfig-4.7.patch +++ /dev/null @@ -1,36 +0,0 @@ -Mark SONAMEs and pkgconfig as xen 4.7 ---- - tools/libxc/Makefile | 2 +- - tools/libxl/Makefile | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Index: xen-4.7.0-testing/tools/libxc/Makefile -=================================================================== ---- xen-4.7.0-testing.orig/tools/libxc/Makefile -+++ xen-4.7.0-testing/tools/libxc/Makefile -@@ -1,7 +1,7 @@ - XEN_ROOT = $(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --MAJOR = 4.6 -+MAJOR = 4.7 - MINOR = 0 - - ifeq ($(CONFIG_LIBXC_MINIOS),y) -Index: xen-4.7.0-testing/tools/libxl/Makefile -=================================================================== ---- xen-4.7.0-testing.orig/tools/libxl/Makefile -+++ xen-4.7.0-testing/tools/libxl/Makefile -@@ -5,10 +5,10 @@ - XEN_ROOT = $(CURDIR)/../.. - include $(XEN_ROOT)/tools/Rules.mk - --MAJOR = 4.6 -+MAJOR = 4.7 - MINOR = 0 - --XLUMAJOR = 4.6 -+XLUMAJOR = 4.7 - XLUMINOR = 0 - - CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ diff --git a/xen.spec b/xen.spec index 3cca96d..e86c48b 100644 --- a/xen.spec +++ b/xen.spec @@ -160,7 +160,7 @@ BuildRequires: xorg-x11-util-devel %endif %endif -Version: 4.7.0_03 +Version: 4.7.0_04 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0 @@ -198,8 +198,6 @@ Source57: xen-utils-0.1.tar.bz2 # For xen-libs Source99: baselibs.conf # Upstream patches -Patch47: xen.pkgconfig-4.7.patch -Patch164: xsa164.patch # Upstream qemu-traditional patches Patch250: VNC-Support-for-ExtendedKeyEvent-client-message.patch Patch251: 0001-net-move-the-tap-buffer-into-TAPState.patch @@ -517,8 +515,6 @@ Authors: %prep %setup -q -n %xen_build_dir -a 1 -a 2 -a 5 -a 6 -a 57 # Upstream patches -%patch47 -p1 -%patch164 -p1 # Upstream qemu patches %patch250 -p1 %patch251 -p1 diff --git a/xsa164.patch b/xsa164.patch deleted file mode 100644 index d916d16..0000000 --- a/xsa164.patch +++ /dev/null @@ -1,37 +0,0 @@ -References: bsc#958007 XSA-164 - -MSI-X: avoid array overrun upon MSI-X table writes - -pt_msix_init() allocates msix->msix_entry[] to just cover -msix->total_entries entries. While pci_msix_readl() resorts to reading -physical memory for out of bounds reads, pci_msix_writel() so far -simply accessed/corrupted unrelated memory. - -pt_iomem_map()'s call to cpu_register_physical_memory() registers a -page granular region, which is necessary as the Pending Bit Array may -share space with the MSI-X table (but nothing else is allowed to). This -also explains why pci_msix_readl() actually honors out of bounds reads, -but pci_msi_writel() doesn't need to. - -This is XSA-164. - -Signed-off-by: Jan Beulich - -Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/hw/pt-msi.c -=================================================================== ---- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/pt-msi.c -+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/hw/pt-msi.c -@@ -447,6 +447,13 @@ static void pci_msix_writel(void *opaque - return; - } - -+ if ( addr - msix->mmio_base_addr >= msix->total_entries * 16 ) -+ { -+ PT_LOG("Error: Out of bounds write to MSI-X table," -+ " addr %016"PRIx64"\n", addr); -+ return; -+ } -+ - entry_nr = (addr - msix->mmio_base_addr) / 16; - entry = &msix->msix_entry[entry_nr]; - offset = ((addr - msix->mmio_base_addr) % 16) / 4;