[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] hw/timer/arm_timer: Avoid array overrun for bad
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 3/3] hw/timer/arm_timer: Avoid array overrun for bad addresses |
Date: |
Mon, 17 Feb 2014 14:37:34 +0000 |
The integrator's timer read/write functions log an error for
bad addresses in guest accesses, but were falling through and
using an out of bounds array index rather than returning early.
Fix this.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/timer/arm_timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index a47afde..fb0a45c 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -320,6 +320,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offset,
n = offset >> 8;
if (n > 2) {
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad timer %d\n", __func__, n);
+ return 0;
}
return arm_timer_read(s->timer[n], offset & 0xff);
@@ -334,6 +335,7 @@ static void icp_pit_write(void *opaque, hwaddr offset,
n = offset >> 8;
if (n > 2) {
qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad timer %d\n", __func__, n);
+ return;
}
arm_timer_write(s->timer[n], offset & 0xff, value);
--
1.8.5
- [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Peter Maydell, 2014/02/17
- [Qemu-devel] [PATCH 2/3] hw/net/stellaris_enet: Avoid unintended sign extension, Peter Maydell, 2014/02/17
- [Qemu-devel] [PATCH 3/3] hw/timer/arm_timer: Avoid array overrun for bad addresses,
Peter Maydell <=
- [Qemu-devel] [PATCH 1/3] hw/misc/arm_sysctl: Fix bad boundary check on mb clock accesses, Peter Maydell, 2014/02/17
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Paolo Bonzini, 2014/02/17
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Andreas Färber, 2014/02/17
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Peter Maydell, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Andreas Färber, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Peter Maydell, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Paolo Bonzini, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Peter Maydell, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Paolo Bonzini, 2014/02/18
- Re: [Qemu-devel] [PATCH 0/3] ARM: three easy patches for coverity-reported issues, Alexander Graf, 2014/02/18