[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/13] hw/timer/grlib_gptimer: Avoid integer overflow
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 06/13] hw/timer/grlib_gptimer: Avoid integer overflows |
Date: |
Sat, 15 Mar 2014 13:56:52 +0400 |
From: Sebastian Huber <address@hidden>
The GPTIMER uses 32-bit registers. Use a 64-bit operation to get the
ptimer count, otherwise we end up with a count of 0 for GPTIMER counter
values of 0xffffffff.
Use the GPTIMER counter value for tracing to avoid an overflow of the
32-bit value passed to trace_grlib_gptimer_enable().
Reviewed-by: Fabien Chouteau <address@hidden>
Signed-off-by: Sebastian Huber <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/timer/grlib_gptimer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 74c16d6..7672d3a 100644
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -106,9 +106,9 @@ static void grlib_gptimer_enable(GPTimer *timer)
/* ptimer is triggered when the counter reach 0 but GPTimer is triggered at
underflow. Set count + 1 to simulate the GPTimer behavior. */
- trace_grlib_gptimer_enable(timer->id, timer->counter + 1);
+ trace_grlib_gptimer_enable(timer->id, timer->counter);
- ptimer_set_count(timer->ptimer, timer->counter + 1);
+ ptimer_set_count(timer->ptimer, (uint64_t)timer->counter + 1);
ptimer_run(timer->ptimer, 1);
}
--
1.7.10.4
- [Qemu-devel] [PULL 00/13] Trivial patches for 2014-03-15, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 05/13] .travis.yml: add IRC notifications for build failures, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 04/13] .travis.yml: trivial whitespace fixup, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 01/13] sasl: Avoid 'Could not find keytab file' in syslog, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 02/13] .travis.yml: add a new build target with non-core devlibs, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 03/13] .travis.yml: re-enable lttng user space trace test, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 13/13] FSL eTSEC: Fix typo in rx ring, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 08/13] misc: Fix typos in comments, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 06/13] hw/timer/grlib_gptimer: Avoid integer overflows,
Michael Tokarev <=
- [Qemu-devel] [PULL 11/13] configure: Don't use __int128_t for clang versions before 3.2, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 07/13] Add qga/qapi-generated to .gitignore, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 10/13] audio: Add 'static' attributes to several variables, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 12/13] scripts/make-release: Don't distribute .git directories, Michael Tokarev, 2014/03/15
- [Qemu-devel] [PULL 09/13] tests: Fix 'make test' for i686 hosts (build regression), Michael Tokarev, 2014/03/15
- Re: [Qemu-devel] [PULL 00/13] Trivial patches for 2014-03-15, Peter Maydell, 2014/03/16