e2a042f066
Fix CVE-2013-4148 (bnc#864812), CVE-2013-4149 (bnc#864649), CVE-2013-4150 (bnc#864650), CVE-2013-4151 (bnc#864653), CVE-2013-4526 (bnc#864671), CVE-2013-4527 (bnc#864673), CVE-2013-4529 (bnc#864678), CVE-2013-4530 (bnc#864682), CVE-2013-4531 (bnc#864796), CVE-2013-4533 (bnc#864655), CVE-2013-4534 (bnc#864811), CVE-2013-4535 / CVE-2013-4536 (bnc#864665), CVE-2013-4537 (bnc#864391), CVE-2013-4538 (bnc#864769), CVE-2013-4539 (bnc#864805), CVE-2013-4540 (bnc#864801), CVE-2013-4541 (bnc#864802), CVE-2013-4542 (bnc#864804), CVE-2013-6399 (bnc#864814), CVE-2014-0182 (bnc#874788) OBS-URL: https://build.opensuse.org/request/show/235280 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=211
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From 085771b0f84bc9e3a9d868ff67c229e83b8431a2 Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Thu, 3 Apr 2014 19:51:23 +0300
|
|
Subject: [PATCH] hpet: fix buffer overrun on invalid state load
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2013-4527 hw/timer/hpet.c buffer overrun
|
|
|
|
hpet is a VARRAY with a uint8 size but static array of 32
|
|
|
|
To fix, make sure num_timers is valid using VMSTATE_VALID hook.
|
|
|
|
Reported-by: Anthony Liguori <anthony@codemonkey.ws>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 3f1c49e2136fa08ab1ef3183fd55def308829584)
|
|
[AF: BNC#864673]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/timer/hpet.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
|
|
index e15d6bc..2792f89 100644
|
|
--- a/hw/timer/hpet.c
|
|
+++ b/hw/timer/hpet.c
|
|
@@ -239,6 +239,18 @@ static int hpet_pre_load(void *opaque)
|
|
return 0;
|
|
}
|
|
|
|
+static bool hpet_validate_num_timers(void *opaque, int version_id)
|
|
+{
|
|
+ HPETState *s = opaque;
|
|
+
|
|
+ if (s->num_timers < HPET_MIN_TIMERS) {
|
|
+ return false;
|
|
+ } else if (s->num_timers > HPET_MAX_TIMERS) {
|
|
+ return false;
|
|
+ }
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int hpet_post_load(void *opaque, int version_id)
|
|
{
|
|
HPETState *s = opaque;
|
|
@@ -307,6 +319,7 @@ static const VMStateDescription vmstate_hpet = {
|
|
VMSTATE_UINT64(isr, HPETState),
|
|
VMSTATE_UINT64(hpet_counter, HPETState),
|
|
VMSTATE_UINT8_V(num_timers, HPETState, 2),
|
|
+ VMSTATE_VALIDATE("num_timers in range", hpet_validate_num_timers),
|
|
VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0,
|
|
vmstate_hpet_timer, HPETTimer),
|
|
VMSTATE_END_OF_LIST()
|