summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBen-Ami Yassour <benami@il.ibm.com>2008-07-06 17:15:07 +0300
committerAvi Kivity <avi@qumranet.com>2008-07-20 12:42:39 +0300
commitc65bbfa1d693d375da51f9c8aa9fb26f09fa19ed (patch)
tree9046a4a8d38b2dc33ca45c975ce52d34ecde1cd0 /arch
parent19fdfa0d133ae216e9d1c69a8333fe63fcf8e584 (diff)
KVM: check injected pic irq within valid pic irqs
Check that an injected pic irq is between 0 and 15. Signed-off-by: Ben-Ami Yassour <benami@il.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/i8259.c6
-rw-r--r--arch/x86/kvm/irq.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index 5857f59ad4aa..c31164e8aa46 100644
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -130,8 +130,10 @@ void kvm_pic_set_irq(void *opaque, int irq, int level)
{
struct kvm_pic *s = opaque;
- pic_set_irq1(&s->pics[irq >> 3], irq & 7, level);
- pic_update_irq(s);
+ if (irq >= 0 && irq < PIC_NUM_PINS) {
+ pic_set_irq1(&s->pics[irq >> 3], irq & 7, level);
+ pic_update_irq(s);
+ }
}
/*
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 2a15be2275c0..7ca47cbb48bb 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -30,6 +30,8 @@
#include "ioapic.h"
#include "lapic.h"
+#define PIC_NUM_PINS 16
+
struct kvm;
struct kvm_vcpu;