Commit 25995e5b authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: check bounds of APIC maps 



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

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fa834e91

arch/x86/kvm/lapic.c

+5 −4
Original line number Diff line number Diff line
@@ -193,15 +193,16 @@ static void recalculate_apic_map(struct kvm *kvm) 
	kvm_for_each_vcpu(i, vcpu, kvm) {

		struct kvm_lapic *apic = vcpu->arch.apic;

		u16 cid, lid;

		u32 ldr;



		new->phys_map[kvm_apic_id(apic)] = apic;

		u32 ldr, aid;



		aid = kvm_apic_id(apic);

		ldr = kvm_apic_get_reg(apic, APIC_LDR);

		cid = apic_cluster_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;

	}

out: