summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-06 23:14:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:23:05 (GMT)
commit27aeaab726aa2c5c62300dfd50cb598987bcd3ee (patch)
treec14c5e9d9838a43c4a21cb5880abfeb2bced8251
parent94c26caff15e8192b2fbdb1de855e27cfb69a724 (diff)
downloadpoky-27aeaab726aa2c5c62300dfd50cb598987bcd3ee.tar.gz
qemu: Security fix CVE-2016-1568
CVE-2016-1568 Qemu: ide: ahci use-after-free vulnerability in aio port commands (From OE-Core rev: 166c19df8be28da255cc68032e2d11afc59d4197) (From OE-Core rev: c2361dd9bb663b00dd194cb7fdb0e07d7e1ab5e1) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch46
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.2.0.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
new file mode 100644
index 0000000..319ae24
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch
@@ -0,0 +1,46 @@
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.2.0/hw/ide/ahci.c
36===================================================================
37--- qemu-2.2.0.orig/hw/ide/ahci.c
38+++ qemu-2.2.0/hw/ide/ahci.c
39@@ -838,6 +838,7 @@ static void ncq_cb(void *opaque, int ret
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 } else {
45 ide_state->status = READY_STAT | SEEK_STAT;
46 }
diff --git a/meta/recipes-devtools/qemu/qemu_2.2.0.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
index 72fda62..66e928f 100644
--- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -24,6 +24,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
24 file://CVE-2015-7504.patch \ 24 file://CVE-2015-7504.patch \
25 file://CVE-2015-7512.patch \ 25 file://CVE-2015-7512.patch \
26 file://CVE-2015-8345.patch \ 26 file://CVE-2015-8345.patch \
27 file://CVE-2016-1568.patch \
27 " 28 "
28SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 29SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
29SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" 30SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"