Skip to content

Commit

Permalink
KVM: fix irq_source_id size verification
Browse files Browse the repository at this point in the history
find_first_zero_bit works with bit numbers, not bytes.

Fixes

https://sourceforge.net/tracker/?func=detail&aid=2847560&group_id=180599&atid=893831

Reported-by: "Xu, Jiajun" <jiajun.xu@intel.com>
Cc: stable@kernel.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Marcelo Tosatti authored and Avi Kivity committed Dec 3, 2009
1 parent 6be7d30 commit cd5a268
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions virt/kvm/irq_comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,9 @@ int kvm_request_irq_source_id(struct kvm *kvm)
int irq_source_id;

mutex_lock(&kvm->irq_lock);
irq_source_id = find_first_zero_bit(bitmap,
sizeof(kvm->arch.irq_sources_bitmap));
irq_source_id = find_first_zero_bit(bitmap, BITS_PER_LONG);

if (irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
if (irq_source_id >= BITS_PER_LONG) {
printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n");
irq_source_id = -EFAULT;
goto unlock;
Expand All @@ -240,7 +239,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)

mutex_lock(&kvm->irq_lock);
if (irq_source_id < 0 ||
irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) {
irq_source_id >= BITS_PER_LONG) {
printk(KERN_ERR "kvm: IRQ source ID out of range!\n");
goto unlock;
}
Expand Down

0 comments on commit cd5a268

Please sign in to comment.