|
@@ -72,11 +72,15 @@ int kvm_request_irq_source_id(struct kvm *kvm)
|
|
unsigned long *bitmap = &kvm->arch.irq_sources_bitmap;
|
|
unsigned long *bitmap = &kvm->arch.irq_sources_bitmap;
|
|
int irq_source_id = find_first_zero_bit(bitmap,
|
|
int irq_source_id = find_first_zero_bit(bitmap,
|
|
sizeof(kvm->arch.irq_sources_bitmap));
|
|
sizeof(kvm->arch.irq_sources_bitmap));
|
|
|
|
+
|
|
if (irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
if (irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n");
|
|
printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n");
|
|
- irq_source_id = -EFAULT;
|
|
|
|
- } else
|
|
|
|
- set_bit(irq_source_id, bitmap);
|
|
|
|
|
|
+ return -EFAULT;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ASSERT(irq_source_id != KVM_USERSPACE_IRQ_SOURCE_ID);
|
|
|
|
+ set_bit(irq_source_id, bitmap);
|
|
|
|
+
|
|
return irq_source_id;
|
|
return irq_source_id;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -84,7 +88,9 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- if (irq_source_id <= 0 ||
|
|
|
|
|
|
+ ASSERT(irq_source_id != KVM_USERSPACE_IRQ_SOURCE_ID);
|
|
|
|
+
|
|
|
|
+ if (irq_source_id < 0 ||
|
|
irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
|
|
printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
|
|
printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
|
|
return;
|
|
return;
|