From 096685fc2a955ea17d5363ab452e301be2b43873 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 9 Nov 2011 18:45:38 +0000 Subject: [PATCH] hw/omap_intc.c: Avoid crash on access to nonexistent banked registers Avoid a crash due to null pointer dereference if a guest attempts to access banked registers for a nonexistent bank. Spotted by Coverity (see bug 887883). Signed-off-by: Peter Maydell Signed-off-by: Anthony Liguori --- hw/omap_intc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/omap_intc.c b/hw/omap_intc.c index 0f7fd9dd4c..45efa25109 100644 --- a/hw/omap_intc.c +++ b/hw/omap_intc.c @@ -398,6 +398,9 @@ static uint64_t omap2_inth_read(void *opaque, target_phys_addr_t addr, if (bank_no < s->nbanks) { offset &= ~0x60; bank = &s->bank[bank_no]; + } else { + OMAP_BAD_REG(addr); + return 0; } } @@ -476,6 +479,9 @@ static void omap2_inth_write(void *opaque, target_phys_addr_t addr, if (bank_no < s->nbanks) { offset &= ~0x60; bank = &s->bank[bank_no]; + } else { + OMAP_BAD_REG(addr); + return; } } -- 2.39.2