diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2017-05-10 14:17:34 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2017-05-11 15:28:59 +0200 |
commit | 17a9a734122e446bd2708a4273af1fe4eacb87ae (patch) | |
tree | 55c8bf72fe305f7024b684a1642deb61dac12082 /meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch | |
parent | 5c021b4550f77ddc7d32664a08e46ba69d16c2c7 (diff) | |
download | poky-17a9a734122e446bd2708a4273af1fe4eacb87ae.tar.gz |
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 <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-6351_p2.patch | 60 |
1 files changed, 0 insertions, 60 deletions
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 @@ | |||
1 | From cc96677469388bad3d66479379735cf75db069e3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paolo Bonzini <pbonzini@redhat.com> | ||
3 | Date: Mon, 20 Jun 2016 16:32:39 +0200 | ||
4 | Subject: [PATCH] scsi: esp: fix migration | ||
5 | |||
6 | Commit 926cde5 ("scsi: esp: make cmdbuf big enough for maximum CDB size", | ||
7 | 2016-06-16) changed the size of a migrated field. Split it in two | ||
8 | parts, and only migrate the second part in a new vmstate version. | ||
9 | |||
10 | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | CVE: CVE-2016-6351 patch1 | ||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | --- | ||
17 | hw/scsi/esp.c | 5 +++-- | ||
18 | include/migration/vmstate.h | 5 ++++- | ||
19 | 2 files changed, 7 insertions(+), 3 deletions(-) | ||
20 | |||
21 | Index: qemu-2.4.0/hw/scsi/esp.c | ||
22 | =================================================================== | ||
23 | --- qemu-2.4.0.orig/hw/scsi/esp.c | ||
24 | +++ qemu-2.4.0/hw/scsi/esp.c | ||
25 | @@ -571,7 +571,7 @@ static bool esp_mem_accepts(void *opaque | ||
26 | |||
27 | const VMStateDescription vmstate_esp = { | ||
28 | .name ="esp", | ||
29 | - .version_id = 3, | ||
30 | + .version_id = 4, | ||
31 | .minimum_version_id = 3, | ||
32 | .fields = (VMStateField[]) { | ||
33 | VMSTATE_BUFFER(rregs, ESPState), | ||
34 | @@ -582,7 +582,8 @@ const VMStateDescription vmstate_esp = { | ||
35 | VMSTATE_BUFFER(ti_buf, ESPState), | ||
36 | VMSTATE_UINT32(status, ESPState), | ||
37 | VMSTATE_UINT32(dma, ESPState), | ||
38 | - VMSTATE_BUFFER(cmdbuf, ESPState), | ||
39 | + VMSTATE_PARTIAL_BUFFER(cmdbuf, ESPState, 16), | ||
40 | + VMSTATE_BUFFER_START_MIDDLE_V(cmdbuf, ESPState, 16, 4), | ||
41 | VMSTATE_UINT32(cmdlen, ESPState), | ||
42 | VMSTATE_UINT32(do_cmd, ESPState), | ||
43 | VMSTATE_UINT32(dma_left, ESPState), | ||
44 | Index: qemu-2.4.0/include/migration/vmstate.h | ||
45 | =================================================================== | ||
46 | --- qemu-2.4.0.orig/include/migration/vmstate.h | ||
47 | +++ qemu-2.4.0/include/migration/vmstate.h | ||
48 | @@ -778,8 +778,11 @@ extern const VMStateInfo vmstate_info_bi | ||
49 | #define VMSTATE_PARTIAL_BUFFER(_f, _s, _size) \ | ||
50 | VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, 0, _size) | ||
51 | |||
52 | +#define VMSTATE_BUFFER_START_MIDDLE_V(_f, _s, _start, _v) \ | ||
53 | + VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, _start, sizeof(typeof_field(_s, _f))) | ||
54 | + | ||
55 | #define VMSTATE_BUFFER_START_MIDDLE(_f, _s, _start) \ | ||
56 | - VMSTATE_STATIC_BUFFER(_f, _s, 0, NULL, _start, sizeof(typeof_field(_s, _f))) | ||
57 | + VMSTATE_BUFFER_START_MIDDLE_V(_f, _s, _start, 0) | ||
58 | |||
59 | #define VMSTATE_PARTIAL_VBUFFER(_f, _s, _size) \ | ||
60 | VMSTATE_VBUFFER(_f, _s, 0, NULL, 0, _size) | ||