From 458864cc18fd7644db942ea98bc7b3132d24e168 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Thu, 3 Apr 2014 19:51:23 +0300 Subject: [PATCH] hpet: fix buffer overrun on invalid state load 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 Signed-off-by: Michael S. Tsirkin Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Juan Quintela --- hw/timer/hpet.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 648b38362..592f2e573 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -228,10 +228,25 @@ 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; + if (!hpet_validate_num_timers(s, version_id)) + return -EINVAL; + /* Recalculate the offset between the main counter and guest time */ s->hpet_offset = ticks_to_ns(s->hpet_counter) - qemu_get_clock_ns(vm_clock); -- 2.39.5