summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Sarmadi <sona.sarmadi@enea.com>2017-05-10 12:17:31 (GMT)
committerAdrian Dudau <adrian.dudau@enea.com>2017-05-11 13:28:36 (GMT)
commit07c94f74cda62c672e7e80292f917a76e1214be0 (patch)
tree2de451ef1dfb9fb55d90f1c4dcf5bf492dbce40e
parent3fc5d271f554e07c88b1195812e48a0d86291395 (diff)
downloadpoky-07c94f74cda62c672e7e80292f917a76e1214be0.tar.gz
qemu: updgrade to 2.5.1
This upgrade includes several worthwhile fixes, security and otherwise, including a complete fix for CVE-2016-2857. * drop CVE-2016-2857.patch as it's included in this release, along with several related patches which complete the fixes for CVE-2016-2857: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=9bddb45dbc010cd8ee4d48bd501fa5d18dcec00c http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e3a2cdfcb5e282139217924044ec5af00c7f8eed http://git.qemu.org/?p=qemu.git;a=commitdiff;h=fe90bdc25bcf9954ee286cd51de94776a17d04f6 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=d0ee85b4e4c6cc2c8fac311d6df2ed412ed0df5f http://git.qemu.org/?p=qemu.git;a=commitdiff;h=80b6e5723fac428ea6c08c821078286f43975df8 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=a375e0b03ee3438924b24a45e61ee189ec9361db * drop CVE-2016-2197.patch as an equivalent fix is included in this release http://git.qemu.org/?p=qemu.git;a=commitdiff;h=aaf4fb6afb4653c86059255811886a5c4ea271f3 * drop CVE-2016-1568.patch as it's included in this release http://git.qemu.org/?p=qemu.git;a=commitdiff;h=4f046a6ba1d558eb043dc13a80d40cf7cb62ef95 (From OE-Core rev: 8332cea4baf2bda81fa4d33ccedefaec4313d454) This patch is backported from upstream morty branch: http://git.yoctoproject.org/cgit/cgit.cgi/poky/patch/?id=c63c1aaaa6f2f2ad583e8e513308acab18841c83 Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.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>
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch46
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch59
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch51
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.5.1.bb (renamed from meta/recipes-devtools/qemu/qemu_2.5.0.bb)7
4 files changed, 2 insertions, 161 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
deleted file mode 100644
index 56fd346..0000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 4ab0359a8ae182a7ac5c99609667273167703fab Mon Sep 17 00:00:00 2001
2From: Prasad J Pandit <pjp@fedoraproject.org>
3Date: Mon, 11 Jan 2016 14:10:42 -0500
4Subject: [PATCH] ide: ahci: reset ncq object to unused on error
5
6When processing NCQ commands, AHCI device emulation prepares a
7NCQ transfer object; To which an aio control block(aiocb) object
8is assigned in 'execute_ncq_command'. In case, when the NCQ
9command is invalid, the 'aiocb' object is not assigned, and NCQ
10transfer object is left as 'used'. This leads to a use after
11free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'.
12Reset NCQ transfer object to 'unused' to avoid it.
13
14[Maintainer edit: s/ACHI/AHCI/ in the commit message. --js]
15
16Reported-by: Qinghao Tang <luodalongde@gmail.com>
17Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
18Reviewed-by: John Snow <jsnow@redhat.com>
19Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com
20Signed-off-by: John Snow <jsnow@redhat.com>
21
22Upstream-Status: Backport
23
24http://git.qemu.org/?p=qemu.git;a=commit;h=4ab0359a8ae182a7ac5c99609667273167703fab
25
26CVE: CVE-2016-1568
27[Yocto # 9013]
28
29Signed-off-by: Armin Kuster <akuster@mvista.com>
30
31---
32 hw/ide/ahci.c | 1 +
33 1 file changed, 1 insertion(+)
34
35Index: qemu-2.5.0/hw/ide/ahci.c
36===================================================================
37--- qemu-2.5.0.orig/hw/ide/ahci.c
38+++ qemu-2.5.0/hw/ide/ahci.c
39@@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *nc
40 ide_state->error = ABRT_ERR;
41 ide_state->status = READY_STAT | ERR_STAT;
42 ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
43+ ncq_tfs->used = 0;
44 }
45
46 static void ncq_finish(NCQTransferState *ncq_tfs)
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
deleted file mode 100644
index 946435c..0000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From: Prasad J Pandit <address@hidden>
2
3When IDE AHCI emulation uses Frame Information Structures(FIS)
4engine for data transfer, the mapped FIS buffer address is stored
5in a static 'bounce.buffer'. When a request is made to map another
6memory region, address_space_map() returns NULL because
7'bounce.buffer' is in_use. It leads to a null pointer dereference
8error while doing 'dma_memory_unmap'. Add a check to avoid it.
9
10Reported-by: Zuozhi fzz <address@hidden>
11Signed-off-by: Prasad J Pandit <address@hidden>
12
13Upstream-Status: Backport
14https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05740.html
15
16CVE: CVE-2016-2197
17Signed-off-by: Armin Kuster <akuster@mvista.com>
18
19---
20 hw/ide/ahci.c | 16 ++++++++++------
21 1 file changed, 10 insertions(+), 6 deletions(-)
22
23 Update as per review
24 -> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05715.html
25
26Index: qemu-2.5.0/hw/ide/ahci.c
27===================================================================
28--- qemu-2.5.0.orig/hw/ide/ahci.c
29+++ qemu-2.5.0/hw/ide/ahci.c
30@@ -661,9 +661,11 @@ static bool ahci_map_fis_address(AHCIDev
31
32 static void ahci_unmap_fis_address(AHCIDevice *ad)
33 {
34- dma_memory_unmap(ad->hba->as, ad->res_fis, 256,
35- DMA_DIRECTION_FROM_DEVICE, 256);
36- ad->res_fis = NULL;
37+ if (ad->res_fis) {
38+ dma_memory_unmap(ad->hba->as, ad->res_fis, 256,
39+ DMA_DIRECTION_FROM_DEVICE, 256);
40+ ad->res_fis = NULL;
41+ }
42 }
43
44 static bool ahci_map_clb_address(AHCIDevice *ad)
45@@ -677,9 +679,11 @@ static bool ahci_map_clb_address(AHCIDev
46
47 static void ahci_unmap_clb_address(AHCIDevice *ad)
48 {
49- dma_memory_unmap(ad->hba->as, ad->lst, 1024,
50- DMA_DIRECTION_FROM_DEVICE, 1024);
51- ad->lst = NULL;
52+ if (ad->lst) {
53+ dma_memory_unmap(ad->hba->as, ad->lst, 1024,
54+ DMA_DIRECTION_FROM_DEVICE, 1024);
55+ ad->lst = NULL;
56+ }
57 }
58
59 static void ahci_write_fis_sdb(AHCIState *s, NCQTransferState *ncq_tfs)
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch
deleted file mode 100644
index 73cfa2a..0000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 362786f14a753d8a5256ef97d7c10ed576d6572b Mon Sep 17 00:00:00 2001
2From: Prasad J Pandit <pjp@fedoraproject.org>
3Date: Wed, 2 Mar 2016 17:29:58 +0530
4Subject: [PATCH] net: check packet payload length
5
6While computing IP checksum, 'net_checksum_calculate' reads
7payload length from the packet. It could exceed the given 'data'
8buffer size. Add a check to avoid it.
9
10Reported-by: Liu Ling <liuling-it@360.cn>
11Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
12Signed-off-by: Jason Wang <jasowang@redhat.com>
13
14Upstream-Status: Backport
15CVE: CVE-2016-2857
16
17http://git.qemu.org/?p=qemu.git;a=commit;h=362786f14a753d8a5256ef97d7c10ed576d6572b
18Signed-off-by: Armin Kuster <akuster@mvista.com>
19
20---
21 net/checksum.c | 10 ++++++++--
22 1 file changed, 8 insertions(+), 2 deletions(-)
23
24Index: qemu-2.5.0/net/checksum.c
25===================================================================
26--- qemu-2.5.0.orig/net/checksum.c
27+++ qemu-2.5.0/net/checksum.c
28@@ -59,6 +59,11 @@ void net_checksum_calculate(uint8_t *dat
29 int hlen, plen, proto, csum_offset;
30 uint16_t csum;
31
32+ /* Ensure data has complete L2 & L3 headers. */
33+ if (length < 14 + 20) {
34+ return;
35+ }
36+
37 if ((data[14] & 0xf0) != 0x40)
38 return; /* not IPv4 */
39 hlen = (data[14] & 0x0f) * 4;
40@@ -76,8 +81,9 @@ void net_checksum_calculate(uint8_t *dat
41 return;
42 }
43
44- if (plen < csum_offset+2)
45- return;
46+ if (plen < csum_offset + 2 || 14 + hlen + plen > length) {
47+ return;
48+ }
49
50 data[14+hlen+csum_offset] = 0;
51 data[14+hlen+csum_offset+1] = 0;
diff --git a/meta/recipes-devtools/qemu/qemu_2.5.0.bb b/meta/recipes-devtools/qemu/qemu_2.5.1.bb
index b965f69..528e546 100644
--- a/meta/recipes-devtools/qemu/qemu_2.5.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.5.1.bb
@@ -7,11 +7,8 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
7 file://qemu-enlarge-env-entry-size.patch \ 7 file://qemu-enlarge-env-entry-size.patch \
8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ 8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
9 file://no-valgrind.patch \ 9 file://no-valgrind.patch \
10 file://CVE-2016-1568.patch \
11 file://CVE-2016-2197.patch \
12 file://CVE-2016-2198.patch \ 10 file://CVE-2016-2198.patch \
13 file://pathlimit.patch \ 11 file://pathlimit.patch \
14 file://CVE-2016-2857.patch \
15 file://rng_move_request_from_RngEgd_to_RngBackend.patch \ 12 file://rng_move_request_from_RngEgd_to_RngBackend.patch \
16 file://rng_remove_the_unused_request_cancellation_code.patch \ 13 file://rng_remove_the_unused_request_cancellation_code.patch \
17 file://rng_move_request_queue_cleanup_from_RngEgd_to_RngBackend.patch \ 14 file://rng_move_request_queue_cleanup_from_RngEgd_to_RngBackend.patch \
@@ -30,8 +27,8 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
30 file://CVE-2016-4952.patch \ 27 file://CVE-2016-4952.patch \
31 " 28 "
32SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 29SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
33SRC_URI[md5sum] = "f469f2330bbe76e3e39db10e9ac4f8db" 30SRC_URI[md5sum] = "42e73182dea8b9213fa7050e168a4615"
34SRC_URI[sha256sum] = "3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4" 31SRC_URI[sha256sum] = "028752c33bb786abbfe496ba57315dc5a7d0a33b5a7a767f6d7a29020c525d2c"
35 32
36COMPATIBLE_HOST_class-target_mips64 = "null" 33COMPATIBLE_HOST_class-target_mips64 = "null"
37 34