diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-17 21:47:23 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-03 02:32:19 -0500 |
commit | cd5a2685de4a642fd0bd763e8c19711ef08dbe27 (patch) | |
tree | 171f7b992801a61aa8655414c19c82a1042a30d4 /virt/kvm | |
parent | 6be7d3062b59af891be7e40c6802350de5f78cef (diff) |
KVM: fix irq_source_id size verification
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>
Diffstat (limited to 'virt/kvm')
-rw-r--r-- | virt/kvm/irq_comm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index 00c68d298579..0d454d352717 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c | |||
@@ -215,10 +215,9 @@ int kvm_request_irq_source_id(struct kvm *kvm) | |||
215 | int irq_source_id; | 215 | int irq_source_id; |
216 | 216 | ||
217 | mutex_lock(&kvm->irq_lock); | 217 | mutex_lock(&kvm->irq_lock); |
218 | irq_source_id = find_first_zero_bit(bitmap, | 218 | irq_source_id = find_first_zero_bit(bitmap, BITS_PER_LONG); |
219 | sizeof(kvm->arch.irq_sources_bitmap)); | ||
220 | 219 | ||
221 | if (irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) { | 220 | if (irq_source_id >= BITS_PER_LONG) { |
222 | printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n"); | 221 | printk(KERN_WARNING "kvm: exhaust allocatable IRQ sources!\n"); |
223 | irq_source_id = -EFAULT; | 222 | irq_source_id = -EFAULT; |
224 | goto unlock; | 223 | goto unlock; |
@@ -240,7 +239,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) | |||
240 | 239 | ||
241 | mutex_lock(&kvm->irq_lock); | 240 | mutex_lock(&kvm->irq_lock); |
242 | if (irq_source_id < 0 || | 241 | if (irq_source_id < 0 || |
243 | irq_source_id >= sizeof(kvm->arch.irq_sources_bitmap)) { | 242 | irq_source_id >= BITS_PER_LONG) { |
244 | printk(KERN_ERR "kvm: IRQ source ID out of range!\n"); | 243 | printk(KERN_ERR "kvm: IRQ source ID out of range!\n"); |
245 | goto unlock; | 244 | goto unlock; |
246 | } | 245 | } |