qemu: upgrade to 2.1.2

Mainly a bug fix release.

- Patch 0001-Back-porting-security-fix-CVE-2014-5388.patch removed,
included upstream.

(From OE-Core rev: e2dadd361b3728e4c3aac2a7e40dac8cebbd5406)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Cristian Iorga
2014-10-31 16:36:07 +02:00
committed by Richard Purdie
parent c3d0cd9402
commit ddac00a235
2 changed files with 2 additions and 33 deletions

View File

@@ -1,30 +0,0 @@
Prevent out-of-bounds array access on
acpi_pcihp_pci_status.
Upstream-Status: Backport
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
---
v2:
- change commit message.
- add 'Reviewed-by'
---
hw/acpi/pcihp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index fae663a..34dedf1 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -231,7 +231,7 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size)
uint32_t val = 0;
int bsel = s->hotplug_select;
- if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) {
+ if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) {
return 0;
}
--
1.7.12.4

View File

@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
file://qemu-enlarge-env-entry-size.patch \
file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
file://0001-Back-porting-security-fix-CVE-2014-5388.patch \
"
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
SRC_URI[md5sum] = "6726977292b448cbc7f89998fac6983b"
SRC_URI[sha256sum] = "397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802"
SRC_URI[md5sum] = "0ff197c4ed4b695620bc4734e77c888f"
SRC_URI[sha256sum] = "fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885"
COMPATIBLE_HOST_class-target_mips64 = "null"