[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/20] hw/timer/pxa2xx_timer: Add assertion to silent static analy
From: |
Laurent Vivier |
Subject: |
[PULL 20/20] hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning |
Date: |
Mon, 4 May 2020 13:57:58 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
pxa2xx_timer_tick4() takes an opaque pointer, then calls
pxa2xx_timer_update4(), so the static analyzer can not
verify that the 'n < 8':
425 static void pxa2xx_timer_tick4(void *opaque)
426 {
427 PXA2xxTimer4 *t = (PXA2xxTimer4 *) opaque;
428 PXA2xxTimerInfo *i = (PXA2xxTimerInfo *) t->tm.info;
429
430 pxa2xx_timer_tick(&t->tm);
433 if (t->control & (1 << 6))
434 pxa2xx_timer_update4(i, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
t->tm.num - 4);
135 static void pxa2xx_timer_update4(void *opaque, uint64_t now_qemu, int n)
136 {
137 PXA2xxTimerInfo *s = (PXA2xxTimerInfo *) opaque;
140 static const int counters[8] = { 0, 0, 0, 0, 4, 4, 6, 6 };
142
143 if (s->tm4[n].control & (1 << 7))
144 counter = n;
145 else
146 counter = counters[n];
Add an assert() to give the static analyzer a hint, this fixes a
warning reported by Clang static code analyzer:
CC hw/timer/pxa2xx_timer.o
hw/timer/pxa2xx_timer.c:146:17: warning: Assigned value is garbage or
undefined
counter = counters[n];
^ ~~~~~~~~~~~
Reported-by: Clang Static Analyzer
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/timer/pxa2xx_timer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index cd172cc1e960..944c16588926 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -140,6 +140,7 @@ static void pxa2xx_timer_update4(void *opaque, uint64_t
now_qemu, int n)
static const int counters[8] = { 0, 0, 0, 0, 4, 4, 6, 6 };
int counter;
+ assert(n < ARRAY_SIZE(counters));
if (s->tm4[n].control & (1 << 7))
counter = n;
else
--
2.26.2
- [PULL 10/20] chardev: Add macOS to list of OSes that support -chardev serial, (continued)
- [PULL 10/20] chardev: Add macOS to list of OSes that support -chardev serial, Laurent Vivier, 2020/05/04
- [PULL 07/20] hw/mem/pc-dimm: Fix line over 80 characters warning, Laurent Vivier, 2020/05/04
- [PULL 11/20] Compress lines for immediate return, Laurent Vivier, 2020/05/04
- [PULL 14/20] hw/i2c/pm_smbus: Remove dead assignment, Laurent Vivier, 2020/05/04
- [PULL 08/20] elf_ops: Don't try to g_mapped_file_unref(NULL), Laurent Vivier, 2020/05/04
- [PULL 18/20] hw/gpio/aspeed_gpio: Remove dead assignment, Laurent Vivier, 2020/05/04
- [PULL 05/20] MAINTAINERS: Mark the LatticeMico32 target as orphan, Laurent Vivier, 2020/05/04
- [PULL 16/20] hw/ide/sii3112: Remove dead assignment, Laurent Vivier, 2020/05/04
- [PULL 12/20] block: Avoid dead assignment, Laurent Vivier, 2020/05/04
- [PULL 19/20] hw/timer/stm32f2xx_timer: Remove dead assignment, Laurent Vivier, 2020/05/04
- [PULL 20/20] hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning,
Laurent Vivier <=
- [PULL 17/20] hw/isa/i82378: Remove dead assignment, Laurent Vivier, 2020/05/04
- [PULL 15/20] hw/input/adb-kbd: Remove dead assignment, Laurent Vivier, 2020/05/04
- Re: [PULL 00/20] Trivial branch for 5.1 patches, Peter Maydell, 2020/05/04