Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=855ecc0925f40e7e042ca0b03f6ccb8e214e49c4
commit 855ecc0925f40e7e042ca0b03f6ccb8e214e49c4 Author: DeX77 <[email protected]> Date: Sun Feb 22 10:52:34 2015 +0100 qemu-2.2.0-2-x86_64 * relbump - remove CVE patches * fix static splits diff --git a/source/xapps-extra/qemu/CVE-2013-4375.patch b/source/xapps-extra/qemu/CVE-2013-4375.patch deleted file mode 100644 index 39b7340..0000000 --- a/source/xapps-extra/qemu/CVE-2013-4375.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a76f48e53382e6f039db6278443e3ce437653302 Mon Sep 17 00:00:00 2001 -From: Matthew Daley <[email protected]> -Date: Thu, 10 Oct 2013 14:10:48 +0000 -Subject: [PATCH] xen_disk: mark ioreq as mapped before unmapping in error case - -Commit 4472beae modified the semantics of ioreq_{un,}map so that they are -idempotent if called when they're not needed (ie., twice in a row). However, -it neglected to handle the case where batch mapping is not being used (the -default), and one of the grants fails to map. In this case, ioreq_unmap will -be called to unwind and unmap any mappings already performed, but ioreq_unmap -simply returns due to the aforementioned change (the ioreq has not already -been marked as mapped). - -The frontend user can therefore force xen_disk to leak grant mappings, a -per-domain limited resource. - -Fix by marking the ioreq as mapped before calling ioreq_unmap in this -situation. - -Signed-off-by: Matthew Daley <[email protected]> -Signed-off-by: Stefano Stabellini <[email protected]> ---- - hw/block/xen_disk.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -Index: qemu-1.5.0+dfsg/hw/block/xen_disk.c -=================================================================== ---- qemu-1.5.0+dfsg.orig/hw/block/xen_disk.c 2014-01-28 05:41:30.460949671 -0500 -+++ qemu-1.5.0+dfsg/hw/block/xen_disk.c 2014-01-28 05:41:30.456949671 -0500 -@@ -404,6 +404,7 @@ - xen_be_printf(&ioreq->blkdev->xendev, 0, - "can't map grant ref %d (%s, %d maps)\n", - refs[i], strerror(errno), ioreq->blkdev->cnt_map); -+ ioreq->mapped = 1; - ioreq_unmap(ioreq); - return -1; - } diff --git a/source/xapps-extra/qemu/CVE-2013-4544.patch b/source/xapps-extra/qemu/CVE-2013-4544.patch deleted file mode 100644 index 1d2dba3..0000000 --- a/source/xapps-extra/qemu/CVE-2013-4544.patch +++ /dev/null @@ -1,118 +0,0 @@ -Description: fix possible arbitrary code execution via vmxnet3 device -Origin: upstream, http://git.qemu.org/?p=qemu.git;a=commit;h=8c6c0478996e8f77374e69b6df68655b0b4ba689 -Origin: upstream, http://git.qemu.org/?p=qemu.git;a=commit;h=9878d173f574df74bde0ff50b2f81009fbee81bb -Origin: upstream, http://git.qemu.org/?p=qemu.git;a=commit;h=3c99afc779c2c78718a565ad8c5e98de7c2c7484 -Origin: upstream, http://git.qemu.org/?p=qemu.git;a=commit;h=f12d048a523780dbda702027d4a91b62af1a08d7 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744213 - -Index: qemu-2.0.0~rc1+dfsg/hw/net/vmxnet3.c -=================================================================== ---- qemu-2.0.0~rc1+dfsg.orig/hw/net/vmxnet3.c 2014-04-03 14:56:23.000000000 -0400 -+++ qemu-2.0.0~rc1+dfsg/hw/net/vmxnet3.c 2014-04-24 16:07:09.794742265 -0400 -@@ -52,6 +52,9 @@ - #define VMXNET3_DEVICE_VERSION 0x1 - #define VMXNET3_DEVICE_REVISION 0x1 - -+/* Number of interrupt vectors for non-MSIx modes */ -+#define VMXNET3_MAX_NMSIX_INTRS (1) -+ - /* Macros for rings descriptors access */ - #define VMXNET3_READ_TX_QUEUE_DESCR8(dpa, field) \ - (vmw_shmem_ld8(dpa + offsetof(struct Vmxnet3_TxQueueDesc, field))) -@@ -1305,6 +1308,51 @@ - (pci_get_byte(s->parent_obj.config + PCI_INTERRUPT_PIN) - 1)); - } - -+static void vmxnet3_validate_interrupt_idx(bool is_msix, int idx) -+{ -+ int max_ints = is_msix ? VMXNET3_MAX_INTRS : VMXNET3_MAX_NMSIX_INTRS; -+ if (idx >= max_ints) { -+ hw_error("Bad interrupt index: %d\n", idx); -+ } -+} -+ -+static void vmxnet3_validate_interrupts(VMXNET3State *s) -+{ -+ int i; -+ -+ VMW_CFPRN("Verifying event interrupt index (%d)", s->event_int_idx); -+ vmxnet3_validate_interrupt_idx(s->msix_used, s->event_int_idx); -+ -+ for (i = 0; i < s->txq_num; i++) { -+ int idx = s->txq_descr[i].intr_idx; -+ VMW_CFPRN("Verifying TX queue %d interrupt index (%d)", i, idx); -+ vmxnet3_validate_interrupt_idx(s->msix_used, idx); -+ } -+ -+ for (i = 0; i < s->rxq_num; i++) { -+ int idx = s->rxq_descr[i].intr_idx; -+ VMW_CFPRN("Verifying RX queue %d interrupt index (%d)", i, idx); -+ vmxnet3_validate_interrupt_idx(s->msix_used, idx); -+ } -+} -+ -+static void vmxnet3_validate_queues(VMXNET3State *s) -+{ -+ /* -+ * txq_num and rxq_num are total number of queues -+ * configured by guest. These numbers must not -+ * exceed corresponding maximal values. -+ */ -+ -+ if (s->txq_num > VMXNET3_DEVICE_MAX_TX_QUEUES) { -+ hw_error("Bad TX queues number: %d\n", s->txq_num); -+ } -+ -+ if (s->rxq_num > VMXNET3_DEVICE_MAX_RX_QUEUES) { -+ hw_error("Bad RX queues number: %d\n", s->rxq_num); -+ } -+} -+ - static void vmxnet3_activate_device(VMXNET3State *s) - { - int i; -@@ -1351,7 +1399,7 @@ - VMXNET3_READ_DRV_SHARED8(s->drv_shmem, devRead.misc.numRxQueues); - - VMW_CFPRN("Number of TX/RX queues %u/%u", s->txq_num, s->rxq_num); -- assert(s->txq_num <= VMXNET3_DEVICE_MAX_TX_QUEUES); -+ vmxnet3_validate_queues(s); - - qdescr_table_pa = - VMXNET3_READ_DRV_SHARED64(s->drv_shmem, devRead.misc.queueDescPA); -@@ -1447,6 +1495,8 @@ - sizeof(s->rxq_descr[i].rxq_stats)); - } - -+ vmxnet3_validate_interrupts(s); -+ - /* Make sure everything is in place before device activation */ - smp_wmb(); - -@@ -2005,7 +2055,6 @@ - } - } - --#define VMXNET3_MSI_NUM_VECTORS (1) - #define VMXNET3_MSI_OFFSET (0x50) - #define VMXNET3_USE_64BIT (true) - #define VMXNET3_PER_VECTOR_MASK (false) -@@ -2016,7 +2065,7 @@ - PCIDevice *d = PCI_DEVICE(s); - int res; - -- res = msi_init(d, VMXNET3_MSI_OFFSET, VMXNET3_MSI_NUM_VECTORS, -+ res = msi_init(d, VMXNET3_MSI_OFFSET, VMXNET3_MAX_NMSIX_INTRS, - VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK); - if (0 > res) { - VMW_WRPRN("Failed to initialize MSI, error %d", res); -@@ -2342,6 +2391,9 @@ - } - } - -+ vmxnet3_validate_queues(s); -+ vmxnet3_validate_interrupts(s); -+ - return 0; - } - diff --git a/source/xapps-extra/qemu/CVE-2014-0150.patch b/source/xapps-extra/qemu/CVE-2014-0150.patch deleted file mode 100644 index 6d1d101..0000000 --- a/source/xapps-extra/qemu/CVE-2014-0150.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qemu-1.6.1/hw/net/virtio-net.c qemu-1.6.1.new/hw/net/virtio-net.c ---- qemu-1.6.1/hw/net/virtio-net.c 2013-10-09 21:20:32.000000000 +0200 -+++ qemu-1.6.1.new/hw/net/virtio-net.c 2014-04-20 16:50:58.355124813 +0200 -@@ -655,7 +655,7 @@ - goto error; - } - -- if (n->mac_table.in_use + mac_data.entries <= MAC_TABLE_ENTRIES) { -+ if (mac_data.entries <= MAC_TABLE_ENTRIES - n->mac_table.in_use) { - s = iov_to_buf(iov, iov_cnt, 0, n->mac_table.macs, - mac_data.entries * ETH_ALEN); - if (s != mac_data.entries * ETH_ALEN) { diff --git a/source/xapps-extra/qemu/CVE-2014-3615.patch b/source/xapps-extra/qemu/CVE-2014-3615.patch deleted file mode 100644 index e7ff944..0000000 --- a/source/xapps-extra/qemu/CVE-2014-3615.patch +++ /dev/null @@ -1,303 +0,0 @@ -From: Peter Maydell <[email protected]> -Date: Fri, 5 Sep 2014 11:26:33 +0000 (+0100) -Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-3615-20140905-1'... -X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=5fd7fc8db92adea953ecf5917168989a28e8871f;hp=fd884c07658d02a96a882b8457d6d7a5cd71a407 - -Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-3615-20140905-1' into staging - -CVE-2014-3615: fix sanity checks in vbe (bochs dispi) and spice. - -# gpg: Signature made Fri 05 Sep 2014 12:18:04 BST using RSA key ID D3E87138 -# gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>" -# gpg: aka "Gerd Hoffmann <[email protected]>" -# gpg: aka "Gerd Hoffmann (private) <[email protected]>" - -* remotes/kraxel/tags/pull-cve-2014-3615-20140905-1: - spice: make sure we don't overflow ssd->buf - vbe: rework sanity checks - vbe: make bochs dispi interface return the correct memory size with qxl - -Signed-off-by: Peter Maydell <[email protected]> ---- - -diff --git a/hw/display/qxl.c b/hw/display/qxl.c -index d43aa49..652af99 100644 ---- a/hw/display/qxl.c -+++ b/hw/display/qxl.c -@@ -2063,6 +2063,7 @@ static int qxl_init_primary(PCIDevice *dev) - - qxl->id = 0; - qxl_init_ramsize(qxl); -+ vga->vbe_size = qxl->vgamem_size; - vga->vram_size_mb = qxl->vga.vram_size >> 20; - vga_common_init(vga, OBJECT(dev), true); - vga_init(vga, OBJECT(dev), -diff --git a/hw/display/vga.c b/hw/display/vga.c -index 65dab8d..62e6243 100644 ---- a/hw/display/vga.c -+++ b/hw/display/vga.c -@@ -576,6 +576,93 @@ void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) - } - } - -+/* -+ * Sanity check vbe register writes. -+ * -+ * As we don't have a way to signal errors to the guest in the bochs -+ * dispi interface we'll go adjust the registers to the closest valid -+ * value. -+ */ -+static void vbe_fixup_regs(VGACommonState *s) -+{ -+ uint16_t *r = s->vbe_regs; -+ uint32_t bits, linelength, maxy, offset; -+ -+ if (!(r[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED)) { -+ /* vbe is turned off -- nothing to do */ -+ return; -+ } -+ -+ /* check depth */ -+ switch (r[VBE_DISPI_INDEX_BPP]) { -+ case 4: -+ case 8: -+ case 16: -+ case 24: -+ case 32: -+ bits = r[VBE_DISPI_INDEX_BPP]; -+ break; -+ case 15: -+ bits = 16; -+ break; -+ default: -+ bits = r[VBE_DISPI_INDEX_BPP] = 8; -+ break; -+ } -+ -+ /* check width */ -+ r[VBE_DISPI_INDEX_XRES] &= ~7u; -+ if (r[VBE_DISPI_INDEX_XRES] == 0) { -+ r[VBE_DISPI_INDEX_XRES] = 8; -+ } -+ if (r[VBE_DISPI_INDEX_XRES] > VBE_DISPI_MAX_XRES) { -+ r[VBE_DISPI_INDEX_XRES] = VBE_DISPI_MAX_XRES; -+ } -+ r[VBE_DISPI_INDEX_VIRT_WIDTH] &= ~7u; -+ if (r[VBE_DISPI_INDEX_VIRT_WIDTH] > VBE_DISPI_MAX_XRES) { -+ r[VBE_DISPI_INDEX_VIRT_WIDTH] = VBE_DISPI_MAX_XRES; -+ } -+ if (r[VBE_DISPI_INDEX_VIRT_WIDTH] < r[VBE_DISPI_INDEX_XRES]) { -+ r[VBE_DISPI_INDEX_VIRT_WIDTH] = r[VBE_DISPI_INDEX_XRES]; -+ } -+ -+ /* check height */ -+ linelength = r[VBE_DISPI_INDEX_VIRT_WIDTH] * bits / 8; -+ maxy = s->vbe_size / linelength; -+ if (r[VBE_DISPI_INDEX_YRES] == 0) { -+ r[VBE_DISPI_INDEX_YRES] = 1; -+ } -+ if (r[VBE_DISPI_INDEX_YRES] > VBE_DISPI_MAX_YRES) { -+ r[VBE_DISPI_INDEX_YRES] = VBE_DISPI_MAX_YRES; -+ } -+ if (r[VBE_DISPI_INDEX_YRES] > maxy) { -+ r[VBE_DISPI_INDEX_YRES] = maxy; -+ } -+ -+ /* check offset */ -+ if (r[VBE_DISPI_INDEX_X_OFFSET] > VBE_DISPI_MAX_XRES) { -+ r[VBE_DISPI_INDEX_X_OFFSET] = VBE_DISPI_MAX_XRES; -+ } -+ if (r[VBE_DISPI_INDEX_Y_OFFSET] > VBE_DISPI_MAX_YRES) { -+ r[VBE_DISPI_INDEX_Y_OFFSET] = VBE_DISPI_MAX_YRES; -+ } -+ offset = r[VBE_DISPI_INDEX_X_OFFSET] * bits / 8; -+ offset += r[VBE_DISPI_INDEX_Y_OFFSET] * linelength; -+ if (offset + r[VBE_DISPI_INDEX_YRES] * linelength > s->vbe_size) { -+ r[VBE_DISPI_INDEX_Y_OFFSET] = 0; -+ offset = r[VBE_DISPI_INDEX_X_OFFSET] * bits / 8; -+ if (offset + r[VBE_DISPI_INDEX_YRES] * linelength > s->vbe_size) { -+ r[VBE_DISPI_INDEX_X_OFFSET] = 0; -+ offset = 0; -+ } -+ } -+ -+ /* update vga state */ -+ r[VBE_DISPI_INDEX_VIRT_HEIGHT] = maxy; -+ s->vbe_line_offset = linelength; -+ s->vbe_start_addr = offset / 4; -+} -+ - static uint32_t vbe_ioport_read_index(void *opaque, uint32_t addr) - { - VGACommonState *s = opaque; -@@ -610,7 +697,7 @@ uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) - val = s->vbe_regs[s->vbe_index]; - } - } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { -- val = s->vram_size / (64 * 1024); -+ val = s->vbe_size / (64 * 1024); - } else { - val = 0; - } -@@ -645,22 +732,13 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - } - break; - case VBE_DISPI_INDEX_XRES: -- if ((val <= VBE_DISPI_MAX_XRES) && ((val & 7) == 0)) { -- s->vbe_regs[s->vbe_index] = val; -- } -- break; - case VBE_DISPI_INDEX_YRES: -- if (val <= VBE_DISPI_MAX_YRES) { -- s->vbe_regs[s->vbe_index] = val; -- } -- break; - case VBE_DISPI_INDEX_BPP: -- if (val == 0) -- val = 8; -- if (val == 4 || val == 8 || val == 15 || -- val == 16 || val == 24 || val == 32) { -- s->vbe_regs[s->vbe_index] = val; -- } -+ case VBE_DISPI_INDEX_VIRT_WIDTH: -+ case VBE_DISPI_INDEX_X_OFFSET: -+ case VBE_DISPI_INDEX_Y_OFFSET: -+ s->vbe_regs[s->vbe_index] = val; -+ vbe_fixup_regs(s); - break; - case VBE_DISPI_INDEX_BANK: - if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) { -@@ -677,19 +755,11 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - !(s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED)) { - int h, shift_control; - -- s->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = -- s->vbe_regs[VBE_DISPI_INDEX_XRES]; -- s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = -- s->vbe_regs[VBE_DISPI_INDEX_YRES]; -+ s->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = 0; - s->vbe_regs[VBE_DISPI_INDEX_X_OFFSET] = 0; - s->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET] = 0; -- -- if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) -- s->vbe_line_offset = s->vbe_regs[VBE_DISPI_INDEX_XRES] >> 1; -- else -- s->vbe_line_offset = s->vbe_regs[VBE_DISPI_INDEX_XRES] * -- ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3); -- s->vbe_start_addr = 0; -+ s->vbe_regs[VBE_DISPI_INDEX_ENABLE] |= VBE_DISPI_ENABLED; -+ vbe_fixup_regs(s); - - /* clear the screen (should be done in BIOS) */ - if (!(val & VBE_DISPI_NOCLEARMEM)) { -@@ -738,40 +808,6 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) - s->vbe_regs[s->vbe_index] = val; - vga_update_memory_access(s); - break; -- case VBE_DISPI_INDEX_VIRT_WIDTH: -- { -- int w, h, line_offset; -- -- if (val < s->vbe_regs[VBE_DISPI_INDEX_XRES]) -- return; -- w = val; -- if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) -- line_offset = w >> 1; -- else -- line_offset = w * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3); -- h = s->vram_size / line_offset; -- /* XXX: support weird bochs semantics ? */ -- if (h < s->vbe_regs[VBE_DISPI_INDEX_YRES]) -- return; -- s->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = w; -- s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = h; -- s->vbe_line_offset = line_offset; -- } -- break; -- case VBE_DISPI_INDEX_X_OFFSET: -- case VBE_DISPI_INDEX_Y_OFFSET: -- { -- int x; -- s->vbe_regs[s->vbe_index] = val; -- s->vbe_start_addr = s->vbe_line_offset * s->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET]; -- x = s->vbe_regs[VBE_DISPI_INDEX_X_OFFSET]; -- if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) -- s->vbe_start_addr += x >> 1; -- else -- s->vbe_start_addr += x * ((s->vbe_regs[VBE_DISPI_INDEX_BPP] + 7) >> 3); -- s->vbe_start_addr >>= 2; -- } -- break; - default: - break; - } -@@ -2285,6 +2321,9 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) - s->vram_size <<= 1; - } - s->vram_size_mb = s->vram_size >> 20; -+ if (!s->vbe_size) { -+ s->vbe_size = s->vram_size; -+ } - - s->is_vbe_vmstate = 1; - memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size); -diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h -index 641f8f4..bbc0cb2 100644 ---- a/hw/display/vga_int.h -+++ b/hw/display/vga_int.h -@@ -93,6 +93,7 @@ typedef struct VGACommonState { - MemoryRegion vram_vbe; - uint32_t vram_size; - uint32_t vram_size_mb; /* property */ -+ uint32_t vbe_size; - uint32_t latch; - bool has_chain4_alias; - MemoryRegion chain4_alias; -diff --git a/ui/spice-display.c b/ui/spice-display.c -index 66e2578..def7b52 100644 ---- a/ui/spice-display.c -+++ b/ui/spice-display.c -@@ -334,11 +334,23 @@ void qemu_spice_create_host_memslot(SimpleSpiceDisplay *ssd) - void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd) - { - QXLDevSurfaceCreate surface; -+ uint64_t surface_size; - - memset(&surface, 0, sizeof(surface)); - -- dprint(1, "%s: %dx%d\n", __FUNCTION__, -- surface_width(ssd->ds), surface_height(ssd->ds)); -+ surface_size = (uint64_t) surface_width(ssd->ds) * -+ surface_height(ssd->ds) * 4; -+ assert(surface_size > 0); -+ assert(surface_size < INT_MAX); -+ if (ssd->bufsize < surface_size) { -+ ssd->bufsize = surface_size; -+ g_free(ssd->buf); -+ ssd->buf = g_malloc(ssd->bufsize); -+ } -+ -+ dprint(1, "%s/%d: %ux%u (size %" PRIu64 "/%d)\n", __func__, ssd->qxl.id, -+ surface_width(ssd->ds), surface_height(ssd->ds), -+ surface_size, ssd->bufsize); - - surface.format = SPICE_SURFACE_FMT_32_xRGB; - surface.width = surface_width(ssd->ds); -@@ -369,8 +381,6 @@ void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd) - if (ssd->num_surfaces == 0) { - ssd->num_surfaces = 1024; - } -- ssd->bufsize = (16 * 1024 * 1024); -- ssd->buf = g_malloc(ssd->bufsize); - } - - /* display listener callbacks */ -@@ -495,7 +505,7 @@ static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info) - info->num_memslots = NUM_MEMSLOTS; - info->num_memslots_groups = NUM_MEMSLOTS_GROUPS; - info->internal_groupslot_id = 0; -- info->qxl_ram_size = ssd->bufsize; -+ info->qxl_ram_size = 16 * 1024 * 1024; - info->n_surfaces = ssd->num_surfaces; - } - diff --git a/source/xapps-extra/qemu/CVE-2014-3640.patch b/source/xapps-extra/qemu/CVE-2014-3640.patch deleted file mode 100644 index 027949c..0000000 --- a/source/xapps-extra/qemu/CVE-2014-3640.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bd9cd78c23e18fb0cb4eee4de5f8a761ebb82698 Mon Sep 17 00:00:00 2001 -From: Petr Matousek <[email protected]> -Date: Thu, 18 Sep 2014 08:35:37 +0200 -Subject: [PATCH] slirp: udp: fix NULL pointer dereference because of - uninitialized socket - -When guest sends udp packet with source port and source addr 0, -uninitialized socket is picked up when looking for matching and already -created udp sockets, and later passed to sosendto() where NULL pointer -dereference is hit during so->slirp->vnetwork_mask.s_addr access. - -Fix this by checking that the socket is not just a socket stub. - -This is CVE-2014-3640. - -Signed-off-by: Petr Matousek <[email protected]> -Reported-by: Xavier Mehrenberger <[email protected]> -Reported-by: Stephane Duverger <[email protected]> -Reviewed-by: Jan Kiszka <[email protected]> -Reviewed-by: Michael S. Tsirkin <[email protected]> -Reviewed-by: Michael Tokarev <[email protected]> -Message-id: [email protected] -Signed-off-by: Peter Maydell <[email protected]> -(cherry picked from commit 01f7cecf0037997cb0e58ec0d56bf9b5a6f7cb2a) -Signed-off-by: Michael Roth <[email protected]> -(cherry picked from commit 9a72433843d912a45046959b1953861211d1838d) ---- - slirp/udp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/slirp/udp.c b/slirp/udp.c -index b105f87..2188176 100644 ---- a/slirp/udp.c -+++ b/slirp/udp.c -@@ -152,7 +152,7 @@ udp_input(register struct mbuf *m, int iphlen) - * Locate pcb for datagram. - */ - so = slirp->udp_last_so; -- if (so->so_lport != uh->uh_sport || -+ if (so == &slirp->udb || so->so_lport != uh->uh_sport || - so->so_laddr.s_addr != ip->ip_src.s_addr) { - struct socket *tmp; - diff --git a/source/xapps-extra/qemu/CVE-2014-3689.patch b/source/xapps-extra/qemu/CVE-2014-3689.patch deleted file mode 100644 index 62ba62a..0000000 --- a/source/xapps-extra/qemu/CVE-2014-3689.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Gerd Hoffmann <[email protected]> -Date: Wed, 29 Oct 2014 12:56:06 +0100 -Subject: [PATCH] vmware-vga: CVE-2014-3689: turn off hw accel - -Quick & easy stopgap for CVE-2014-3689: We just compile out the -hardware acceleration functions which lack sanity checks. Thankfully -we have capability bits for them (SVGA_CAP_RECT_COPY and -SVGA_CAP_RECT_FILL), so guests should deal just fine, in theory. - -Subsequent patches will add the missing checks and re-enable the -hardware acceleration emulation. - -Cc: [email protected] -Signed-off-by: Gerd Hoffmann <[email protected]> -Reviewed-by: Don Koch <[email protected]> ---- - hw/display/vmware_vga.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c -index a6a8cdc..113ce1f 100644 ---- a/hw/display/vmware_vga.c -+++ b/hw/display/vmware_vga.c -@@ -27,8 +27,10 @@ - #include "hw/pci/pci.h" - - #undef VERBOSE -+#if 0 - #define HW_RECT_ACCEL - #define HW_FILL_ACCEL -+#endif - #define HW_MOUSE_ACCEL - - #include "vga_int.h" diff --git a/source/xapps-extra/qemu/CVE-2014-7815.patch b/source/xapps-extra/qemu/CVE-2014-7815.patch deleted file mode 100644 index dbebb5d..0000000 --- a/source/xapps-extra/qemu/CVE-2014-7815.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Petr Matousek <[email protected]> -Date: Mon, 27 Oct 2014 12:41:44 +0100 -Subject: [PATCH] vnc: sanitize bits_per_pixel from the client - -bits_per_pixel that are less than 8 could result in accessing -non-initialized buffers later in the code due to the expectation -that bytes_per_pixel value that is used to initialize these buffers is -never zero. - -To fix this check that bits_per_pixel from the client is one of the -values that the rfb protocol specification allows. - -This is CVE-2014-7815. - -Signed-off-by: Petr Matousek <[email protected]> - -[ kraxel: apply codestyle fix ] - -Signed-off-by: Gerd Hoffmann <[email protected]> -(cherry picked from commit e6908bfe8e07f2b452e78e677da1b45b1c0f6829) ---- - ui/vnc.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/ui/vnc.c b/ui/vnc.c -index 5601cc3..edd514e 100644 ---- a/ui/vnc.c -+++ b/ui/vnc.c -@@ -2024,6 +2024,16 @@ static void set_pixel_format(VncState *vs, - return; - } - -+ switch (bits_per_pixel) { -+ case 8: -+ case 16: -+ case 32: -+ break; -+ default: -+ vnc_client_error(vs); -+ return; -+ } -+ - vs->client_pf.rmax = red_max; - vs->client_pf.rbits = hweight_long(red_max); - vs->client_pf.rshift = red_shift; diff --git a/source/xapps-extra/qemu/CVE-2014-7840.patch b/source/xapps-extra/qemu/CVE-2014-7840.patch deleted file mode 100644 index 758eabb..0000000 --- a/source/xapps-extra/qemu/CVE-2014-7840.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: "Michael S. Tsirkin" <[email protected]> -Date: Wed, 12 Nov 2014 11:44:39 +0200 -Subject: [PATCH] migration: fix parameter validation on ram load - -During migration, the values read from migration stream during ram load -are not validated. Especially offset in host_from_stream_offset() and -also the length of the writes in the callers of said function. - -To fix this, we need to make sure that the [offset, offset + length] -range fits into one of the allocated memory regions. - -Validating addr < len should be sufficient since data seems to always be -managed in TARGET_PAGE_SIZE chunks. - -Fixes: CVE-2014-7840 - -Note: follow-up patches add extra checks on each block->host access. - -Signed-off-by: Michael S. Tsirkin <[email protected]> -Reviewed-by: Paolo Bonzini <[email protected]> -Reviewed-by: Dr. David Alan Gilbert <[email protected]> -Signed-off-by: Amit Shah <[email protected]> -(cherry picked from commit 0be839a2701369f669532ea5884c15bead1c6e08) - -Conflicts: - arch_init.c ---- - arch_init.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch_init.c b/arch_init.c -index 23151b3..b6f7958 100644 ---- a/arch_init.c -+++ b/arch_init.c -@@ -816,8 +816,8 @@ static inline void *host_from_stream_offset(QEMUFile *f, - uint8_t len; - - if (flags & RAM_SAVE_FLAG_CONTINUE) { -- if (!block) { -- fprintf(stderr, "Ack, bad migration stream!\n"); -+ if (!block || block->length <= offset) { -+ fprintf(stderr, "Ack, bad migration stream!"); - return NULL; - } - -@@ -829,8 +829,9 @@ static inline void *host_from_stream_offset(QEMUFile *f, - id[len] = 0; - - QTAILQ_FOREACH(block, &ram_list.blocks, next) { -- if (!strncmp(id, block->idstr, sizeof(id))) -+ if (!strncmp(id, block->idstr, sizeof(id)) && block->length > offset) { - return memory_region_get_ram_ptr(block->mr) + offset; -+ } - } - - fprintf(stderr, "Can't find block %s!\n", id); diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 6081e20..2d3ca2c 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -9,7 +9,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=qemu pkgver=2.2.0 Fuse $USE_DEVEL && pkgver=svn6369 -pkgrel=1 +pkgrel=2 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/" @@ -75,7 +75,11 @@ build() --enable-user \ --disable-virtfs \ --disable-kvm --disable-libssh2 - Fsplit qemu-static /usr/bin/qemu-\* + for user_target in ${TARGET_USER}; + do + Fsplit qemu-static /usr/bin/qemu-${user_target/-linux-user//} + done + make clean || Fdie # Build the real thing _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
