diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/files')
| -rw-r--r-- | meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch | 10 |
2 files changed, 7 insertions, 33 deletions
diff --git a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch b/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch deleted file mode 100644 index ec541fa668..0000000000 --- a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch +++ /dev/null @@ -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 diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch index 7f1c5a9058..b0c2ea5be9 100644 --- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch +++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch @@ -14,6 +14,10 @@ Signed-off-by: Jiang Lu <lu.jiang@windriver.com> Updated it on 2014-01-15 for rebasing Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Update it when upgrade qemu to 2.2.0 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- hw/arm/versatilepb.c | 6 ++++++ 1 file changed, 6 insertions(+) @@ -22,7 +26,7 @@ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index b48d84c..ad2cd5a 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c -@@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) +@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } @@ -32,9 +36,9 @@ index b48d84c..ad2cd5a 100644 + ((unsigned int)ram_size / (1 << 20))); + exit(1); + } - memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size); + memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, + &error_abort); vmstate_register_ram_global(ram); - /* ??? RAM should repeat to fill physical memory space. */ -- 1.7.10.4 |