summary refs log tree commit diff stats
path: root/hw/timer
diff options
context:
space:
mode:
authorPrasad J Pandit <pjp@fedoraproject.org>2016-10-24 16:26:55 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-24 16:26:55 +0100
commit84da15169b45f7080e4b1b32f70e68e726e02740 (patch)
treef491891e29e296bc46b8facb4a590ba7537b664c /hw/timer
parent0fa758c3a069bc59a0d903d69028971c46d1a119 (diff)
downloadfocaccia-qemu-84da15169b45f7080e4b1b32f70e68e726e02740.tar.gz
focaccia-qemu-84da15169b45f7080e4b1b32f70e68e726e02740.zip
timer: stm32f2xx_timer: add check for prescaler value
The STM32F2XX Timer emulator uses a 16 bit prescaler value to
limit the timer clock rate. It does that by dividing the timer
frequency. If the prescaler 's->tim_psc' was set to be UINT_MAX,
it'd lead to divide by zero error. Limit prescaler value to 16
bits to avoid it.

Reported-by: Huawei PSIRT <psirt@huawei.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 1476800269-31902-1-git-send-email-ppandit@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer')
-rw-r--r--hw/timer/stm32f2xx_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index 8c4c1f9f05..e5f5e14a90 100644
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -217,7 +217,7 @@ static void stm32f2xx_timer_write(void *opaque, hwaddr offset,
         return;
     case TIM_PSC:
         timer_val = stm32f2xx_ns_to_ticks(s, now) - s->tick_offset;
-        s->tim_psc = value;
+        s->tim_psc = value & 0xFFFF;
         value = timer_val;
         break;
     case TIM_CNT: