Commit 7c9abfb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: get_tss_base_addr() should return a gpa_t
  KVM: x86: Catch potential overrun in MCE setup
parents e5a92362 abb39119

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu, 
	unsigned bank_num = mcg_cap & 0xff, bank;



	r = -EINVAL;

	if (!bank_num)

	if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS)

		goto out;

	if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000))

		goto out;
@@ -4051,7 +4051,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, 
	return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu);

}



static u32 get_tss_base_addr(struct kvm_vcpu *vcpu,

static gpa_t get_tss_base_addr(struct kvm_vcpu *vcpu,

			     struct desc_struct *seg_desc)

{

	u32 base_addr = get_desc_base(seg_desc);