Skip to content

Commit 2f9b68f

Browse files
vittyvkbonzini
authored andcommitted
KVM: x86: Fix stack-out-of-bounds memory access from ioapic_write_indirect()
KASAN reports the following issue: BUG: KASAN: stack-out-of-bounds in kvm_make_vcpus_request_mask+0x174/0x440 [kvm] Read of size 8 at addr ffffc9001364f638 by task qemu-kvm/4798 CPU: 0 PID: 4798 Comm: qemu-kvm Tainted: G X --------- --- Hardware name: AMD Corporation DAYTONA_X/DAYTONA_X, BIOS RYM0081C 07/13/2020 Call Trace: dump_stack+0xa5/0xe6 print_address_description.constprop.0+0x18/0x130 ? kvm_make_vcpus_request_mask+0x174/0x440 [kvm] __kasan_report.cold+0x7f/0x114 ? kvm_make_vcpus_request_mask+0x174/0x440 [kvm] kasan_report+0x38/0x50 kasan_check_range+0xf5/0x1d0 kvm_make_vcpus_request_mask+0x174/0x440 [kvm] kvm_make_scan_ioapic_request_mask+0x84/0xc0 [kvm] ? kvm_arch_exit+0x110/0x110 [kvm] ? sched_clock+0x5/0x10 ioapic_write_indirect+0x59f/0x9e0 [kvm] ? static_obj+0xc0/0xc0 ? __lock_acquired+0x1d2/0x8c0 ? kvm_ioapic_eoi_inject_work+0x120/0x120 [kvm] The problem appears to be that 'vcpu_bitmap' is allocated as a single long on stack and it should really be KVM_MAX_VCPUS long. We also seem to clear the lower 16 bits of it with bitmap_zero() for no particular reason (my guess would be that 'bitmap' and 'vcpu_bitmap' variables in kvm_bitmap_or_dest_vcpus() caused the confusion: while the later is indeed 16-bit long, the later should accommodate all possible vCPUs). Fixes: 7ee30bc ("KVM: x86: deliver KVM IOAPIC scan request to target vCPUs") Fixes: 9a2ae9f ("KVM: x86: Zero the IOAPIC scan request dest vCPUs bitmap") Reported-by: Dr. David Alan Gilbert <[email protected]> Signed-off-by: Vitaly Kuznetsov <[email protected]> Reviewed-by: Maxim Levitsky <[email protected]> Reviewed-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Cc: [email protected] Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 7c236b8 commit 2f9b68f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/x86/kvm/ioapic.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
319319
unsigned index;
320320
bool mask_before, mask_after;
321321
union kvm_ioapic_redirect_entry *e;
322-
unsigned long vcpu_bitmap;
323322
int old_remote_irr, old_delivery_status, old_dest_id, old_dest_mode;
323+
DECLARE_BITMAP(vcpu_bitmap, KVM_MAX_VCPUS);
324324

325325
switch (ioapic->ioregsel) {
326326
case IOAPIC_REG_VERSION:
@@ -384,9 +384,9 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
384384
irq.shorthand = APIC_DEST_NOSHORT;
385385
irq.dest_id = e->fields.dest_id;
386386
irq.msi_redir_hint = false;
387-
bitmap_zero(&vcpu_bitmap, 16);
387+
bitmap_zero(vcpu_bitmap, KVM_MAX_VCPUS);
388388
kvm_bitmap_or_dest_vcpus(ioapic->kvm, &irq,
389-
&vcpu_bitmap);
389+
vcpu_bitmap);
390390
if (old_dest_mode != e->fields.dest_mode ||
391391
old_dest_id != e->fields.dest_id) {
392392
/*
@@ -399,10 +399,10 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
399399
kvm_lapic_irq_dest_mode(
400400
!!e->fields.dest_mode);
401401
kvm_bitmap_or_dest_vcpus(ioapic->kvm, &irq,
402-
&vcpu_bitmap);
402+
vcpu_bitmap);
403403
}
404404
kvm_make_scan_ioapic_request_mask(ioapic->kvm,
405-
&vcpu_bitmap);
405+
vcpu_bitmap);
406406
} else {
407407
kvm_make_scan_ioapic_request(ioapic->kvm);
408408
}

0 commit comments

Comments
 (0)