diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-04-27 11:48:16 +0200 |
---|---|---|
committer | Nora Björklund <nora.bjorklund@enea.com> | 2016-04-28 09:02:11 +0200 |
commit | d3d0c7af34b996b4518b26d4f3b4eff831a651af (patch) | |
tree | d8dc6be1d65668e4cbaf04f47011542ed35b2031 /meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch | |
parent | c6477d7bc514c951746d6b717c033475fc45f3fc (diff) | |
download | poky-d3d0c7af34b996b4518b26d4f3b4eff831a651af.tar.gz |
qemu: Upgrade 2.1.0 to 2.4.0 to address some CVEs
The upgrade addresses following CVEs:
CVE-2015-7295
CVE-2015-7504
CVE-2015-7512
CVE-2015-8345
CVE-2015-8504
CVE-2016-1568
CVE-2016-2197
CVE-2016-2198
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch new file mode 100644 index 0000000000..946435c430 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From: Prasad J Pandit <address@hidden> | ||
2 | |||
3 | When IDE AHCI emulation uses Frame Information Structures(FIS) | ||
4 | engine for data transfer, the mapped FIS buffer address is stored | ||
5 | in a static 'bounce.buffer'. When a request is made to map another | ||
6 | memory region, address_space_map() returns NULL because | ||
7 | 'bounce.buffer' is in_use. It leads to a null pointer dereference | ||
8 | error while doing 'dma_memory_unmap'. Add a check to avoid it. | ||
9 | |||
10 | Reported-by: Zuozhi fzz <address@hidden> | ||
11 | Signed-off-by: Prasad J Pandit <address@hidden> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05740.html | ||
15 | |||
16 | CVE: CVE-2016-2197 | ||
17 | Signed-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 | |||
26 | Index: 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) | ||