pcihp: fix possible array out of bounds, CVE-2014-5388

Prevent out-of-bounds array access on acpi_pcihp_pci_status.

[From QEMU: fa365d7cd11185237471823a5a33d36765454e16]

(From OE-Core rev: 43ba8f84fb03a8f645995b43966cb87152b69f4c)

Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sona Sarmadi
2014-09-05 12:04:08 +02:00
committed by Richard Purdie
parent 5e18549574
commit f1ce75eccf
2 changed files with 31 additions and 0 deletions

View File

@@ -0,0 +1,30 @@
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,6 +6,7 @@ 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"