iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: check bounds of APIC maps

Browse Source 
They can't be violated now, but play it safe for the future.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Radim Krčmář 2014-11-27 23:30:19 +01:00 committed by Paolo Bonzini
parent fa834e9197
commit 25995e5b4a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kvm/lapic.c
View File

@ -193,15 +193,16 @@ static void recalculate_apic_map(struct kvm *kvm)
kvm_for_each_vcpu(i, vcpu, kvm) { kvm_for_each_vcpu(i, vcpu, kvm) {
struct kvm_lapic *apic = vcpu->arch.apic; struct kvm_lapic *apic = vcpu->arch.apic;
u16 cid, lid; u16 cid, lid;
u32 ldr; u32 ldr, aid;
new->phys_map[kvm_apic_id(apic)] = apic;
aid = kvm_apic_id(apic);
ldr = kvm_apic_get_reg(apic, APIC_LDR); ldr = kvm_apic_get_reg(apic, APIC_LDR);
cid = apic_cluster_id(new, ldr); cid = apic_cluster_id(new, ldr);
lid = apic_logical_id(new, ldr); lid = apic_logical_id(new, ldr);
if (lid) if (aid < ARRAY_SIZE(new->phys_map))
new->phys_map[aid] = apic;
if (lid && cid < ARRAY_SIZE(new->logical_map))
new->logical_map[cid][ffs(lid) - 1] = apic; new->logical_map[cid][ffs(lid) - 1] = apic;
} }
out: out: