[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/31] openpic: add some bounds checking for IRQ num
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 21/31] openpic: add some bounds checking for IRQ numbers |
Date: |
Mon, 7 Jan 2013 16:38:50 +0100 |
From: Scott Wood <address@hidden>
The two checks with abort() guard against potential QEMU-internal
problems, but the EOI check stops the guest from causing updates to queue
position -1 and other havoc if it writes EOI with no interrupt in
service.
Signed-off-by: Scott Wood <address@hidden>
[agraf: remove hunk in code that didn't get applied yet]
Signed-off-by: Alexander Graf <address@hidden>
---
hw/openpic.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index b54308d..35a7fe3 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -414,6 +414,11 @@ static void openpic_set_irq(void *opaque, int n_IRQ, int
level)
OpenPICState *opp = opaque;
IRQSource *src;
+ if (n_IRQ >= MAX_IRQ) {
+ fprintf(stderr, "%s: IRQ %d out of range\n", __func__, n_IRQ);
+ abort();
+ }
+
src = &opp->src[n_IRQ];
DPRINTF("openpic: set irq %d = %d ivpr=0x%08x\n",
n_IRQ, level, src->ivpr);
@@ -888,6 +893,12 @@ static void openpic_cpu_write_internal(void *opaque,
hwaddr addr,
case 0xB0: /* EOI */
DPRINTF("EOI\n");
s_IRQ = IRQ_get_next(opp, &dst->servicing);
+
+ if (s_IRQ < 0) {
+ DPRINTF("%s: EOI with no interrupt in service\n", __func__);
+ break;
+ }
+
IRQ_resetbit(&dst->servicing, s_IRQ);
/* Set up next servicing IRQ */
s_IRQ = IRQ_get_next(opp, &dst->servicing);
--
1.6.0.2
- [Qemu-devel] [PATCH 27/31] PPC: KVM: set has-idle in guest device tree, (continued)
- [Qemu-devel] [PATCH 27/31] PPC: KVM: set has-idle in guest device tree, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 30/31] target-ppc: Error out for -cpu host on unknown PVR, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 26/31] kvm: Update kernel headers, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 28/31] PPC: Bring EPR support closer to reality, Alexander Graf, 2013/01/07
- Re: [Qemu-devel] [PULL 00/31] ppc patch queue 2013-01-07, Andreas Färber, 2013/01/07
- [Qemu-devel] [PATCH 21/31] openpic: add some bounds checking for IRQ numbers,
Alexander Graf <=
- [Qemu-devel] [PATCH 23/31] openpic: IRQ_check: search the queue a word at a time, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 22/31] openpic: fix sense and priority bits, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 29/31] target-ppc: Slim conversion of model definitions to QOM subclasses, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 24/31] openpic: move IACK to its own function, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 25/31] openpic: fix CTPR and de-assertion of interrupts, Alexander Graf, 2013/01/07
- [Qemu-devel] [PATCH 19/31] Revert "openpic: Accelerate pending irq search", Alexander Graf, 2013/01/07