diff options
author | Armin Kuster <akuster@mvista.com> | 2016-01-29 12:35:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-30 12:13:09 +0000 |
commit | 7ee1828d3050a42962400d6360d26e5909ada5b7 (patch) | |
tree | 7c0e0245fd98b14601fb93d29ddd9e9dffa72e85 | |
parent | ca6ec2e392431e3d8c85cb136b6cd568e82483c9 (diff) | |
download | poky-7ee1828d3050a42962400d6360d26e5909ada5b7.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)
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.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 |
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 0000000000..9c40ffb5f8 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-1568.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 4ab0359a8ae182a7ac5c99609667273167703fab Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Mon, 11 Jan 2016 14:10:42 -0500 | ||
4 | Subject: [PATCH] ide: ahci: reset ncq object to unused on error | ||
5 | |||
6 | When processing NCQ commands, AHCI device emulation prepares a | ||
7 | NCQ transfer object; To which an aio control block(aiocb) object | ||
8 | is assigned in 'execute_ncq_command'. In case, when the NCQ | ||
9 | command is invalid, the 'aiocb' object is not assigned, and NCQ | ||
10 | transfer object is left as 'used'. This leads to a use after | ||
11 | free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'. | ||
12 | Reset NCQ transfer object to 'unused' to avoid it. | ||
13 | |||
14 | [Maintainer edit: s/ACHI/AHCI/ in the commit message. --js] | ||
15 | |||
16 | Reported-by: Qinghao Tang <luodalongde@gmail.com> | ||
17 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
18 | Reviewed-by: John Snow <jsnow@redhat.com> | ||
19 | Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com | ||
20 | Signed-off-by: John Snow <jsnow@redhat.com> | ||
21 | |||
22 | Upstream-Status: Backport | ||
23 | |||
24 | http://git.qemu.org/?p=qemu.git;a=commit;h=4ab0359a8ae182a7ac5c99609667273167703fab | ||
25 | |||
26 | CVE: CVE-2016-1568 | ||
27 | [Yocto # 9013] | ||
28 | |||
29 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
30 | |||
31 | --- | ||
32 | hw/ide/ahci.c | 1 + | ||
33 | 1 file changed, 1 insertion(+) | ||
34 | |||
35 | Index: qemu-2.4.0/hw/ide/ahci.c | ||
36 | =================================================================== | ||
37 | --- qemu-2.4.0.orig/hw/ide/ahci.c | ||
38 | +++ qemu-2.4.0/hw/ide/ahci.c | ||
39 | @@ -898,6 +898,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_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index 6c12bee362..6e6bd2b4b9 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb | |||
@@ -14,6 +14,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ | |||
14 | file://CVE-2015-7504.patch \ | 14 | file://CVE-2015-7504.patch \ |
15 | file://CVE-2015-7512.patch \ | 15 | file://CVE-2015-7512.patch \ |
16 | file://CVE-2015-8345.patch \ | 16 | file://CVE-2015-8345.patch \ |
17 | file://CVE-2016-1568.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" | 19 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" |
19 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" | 20 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" |