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>

1 files changed, 0 insertions, 59 deletions

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 946435c430..0000000000
--- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2197.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Prasad J Pandit <address@hidden>
-
-When IDE AHCI emulation uses Frame Information Structures(FIS)
-engine for data transfer, the mapped FIS buffer address is stored
-in a static 'bounce.buffer'. When a request is made to map another
-memory region, address_space_map() returns NULL because
-'bounce.buffer' is in_use. It leads to a null pointer dereference
-error while doing 'dma_memory_unmap'. Add a check to avoid it.
-
-Reported-by: Zuozhi fzz <address@hidden>
-Signed-off-by: Prasad J Pandit <address@hidden>
-
-Upstream-Status: Backport
-https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05740.html
-
-CVE: CVE-2016-2197
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- hw/ide/ahci.c | 16 ++++++++++------
-  1 file changed, 10 insertions(+), 6 deletions(-)
-
-  Update as per review
-    -> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg05715.html
-
-Index: qemu-2.5.0/hw/ide/ahci.c
-===================================================================
---- qemu-2.5.0.orig/hw/ide/ahci.c
-+++ qemu-2.5.0/hw/ide/ahci.c
-@@ -661,9 +661,11 @@ static bool ahci_map_fis_address(AHCIDev
- 
- static void ahci_unmap_fis_address(AHCIDevice *ad)
- {
--    dma_memory_unmap(ad->hba->as, ad->res_fis, 256,
--                     DMA_DIRECTION_FROM_DEVICE, 256);
--    ad->res_fis = NULL;
-+    if (ad->res_fis) {
-+        dma_memory_unmap(ad->hba->as, ad->res_fis, 256,
-+                         DMA_DIRECTION_FROM_DEVICE, 256);
-+        ad->res_fis = NULL;
-+    }
- }
- 
- static bool ahci_map_clb_address(AHCIDevice *ad)
-@@ -677,9 +679,11 @@ static bool ahci_map_clb_address(AHCIDev
- 
- static void ahci_unmap_clb_address(AHCIDevice *ad)
- {
--    dma_memory_unmap(ad->hba->as, ad->lst, 1024,
--                     DMA_DIRECTION_FROM_DEVICE, 1024);
--    ad->lst = NULL;
-+    if (ad->lst) {
-+        dma_memory_unmap(ad->hba->as, ad->lst, 1024,
-+                         DMA_DIRECTION_FROM_DEVICE, 1024);
-+        ad->lst = NULL;
-+    }
- }
- 
- static void ahci_write_fis_sdb(AHCIState *s, NCQTransferState *ncq_tfs)