From 17a9a734122e446bd2708a4273af1fe4eacb87ae Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Wed, 10 May 2017 14:17:34 +0200 Subject: qemu: upgrade to 2.7.0 This upgrade can fix a qemuppc + openssh bug, the ssh connection maybe refused or closed randomly, and it's not easy to reproduce. RP pointed that this upgrade can fix the problem, and it does work in my local testing. * Update add-ptest-in-makefile.patch Here is the Changlog: http://wiki.qemu.org/ChangeLog/2.7 (From OE-Core rev: 056ce17e168bf856ff95a6f659098403169cb889) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie Signed-off-by: Sona Sarmadi Signed-off-by: Adrian Dudau --- .../qemu/qemu/CVE-2016-6351_p2.patch | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch') diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch deleted file mode 100644 index c4ed354e8e..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch +++ /dev/null @@ -1,60 +0,0 @@ -From cc96677469388bad3d66479379735cf75db069e3 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Mon, 20 Jun 2016 16:32:39 +0200 -Subject: [PATCH] scsi: esp: fix migration - -Commit 926cde5 ("scsi: esp: make cmdbuf big enough for maximum CDB size", -2016-06-16) changed the size of a migrated field. Split it in two -parts, and only migrate the second part in a new vmstate version. - -Signed-off-by: Paolo Bonzini - -Upstream-Status: Backport -CVE: CVE-2016-6351 patch1 -Signed-off-by: Armin Kuster - ---- - hw/scsi/esp.c | 5 +++-- - include/migration/vmstate.h | 5 ++++- - 2 files changed, 7 insertions(+), 3 deletions(-) - -Index: qemu-2.4.0/hw/scsi/esp.c -=================================================================== ---- qemu-2.4.0.orig/hw/scsi/esp.c -+++ qemu-2.4.0/hw/scsi/esp.c -@@ -571,7 +571,7 @@ static bool esp_mem_accepts(void *opaque - - const VMStateDescription vmstate_esp = { - .name ="esp", -- .version_id = 3, -+ .version_id = 4, - .minimum_version_id = 3, - .fields = (VMStateField[]) { - VMSTATE_BUFFER(rregs, ESPState), -@@ -582,7 +582,8 @@ const VMStateDescription vmstate_esp = { - VMSTATE_BUFFER(ti_buf, ESPState), - VMSTATE_UINT32(status, ESPState), - VMSTATE_UINT32(dma, ESPState), -- VMSTATE_BUFFER(cmdbuf, ESPState), -+ VMSTATE_PARTIAL_BUFFER(cmdbuf, ESPState, 16), -+ VMSTATE_BUFFER_START_MIDDLE_V(cmdbuf, ESPState, 16, 4), - VMSTATE_UINT32(cmdlen, ESPState), - VMSTATE_UINT32(do_cmd, ESPState), - VMSTATE_UINT32(dma_left, ESPState), -Index: qemu-2.4.0/include/migration/vmstate.h -=================================================================== ---- qemu-2.4.0.orig/include/migration/vmstate.h -+++ qemu-2.4.0/include/migration/vmstate.h -@@ -778,8 +778,11 @@ extern const VMStateInfo vmstate_info_bi - #define VMSTATE_PARTIAL_BUFFER(_f, _s, _size) \ - VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, 0, _size) - -+#define VMSTATE_BUFFER_START_MIDDLE_V(_f, _s, _start, _v) \ -+ VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, _start, sizeof(typeof_field(_s, _f))) -+ - #define VMSTATE_BUFFER_START_MIDDLE(_f, _s, _start) \ -- VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, _start, sizeof(typeof_field(_s, _f))) -+ VMSTATE_BUFFER_START_MIDDLE_V(_f, _s, _start, 0) - - #define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size) \ - VMSTATE_VBUFFER(_f, _s, 0, NULL, 0, _size) -- cgit v1.2.3-54-g00ecf