diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 16:24:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-05 16:24:15 -0500 |
| commit | 7c9abfb884b8737f0afdc8a88bcea77526f0da87 (patch) | |
| tree | 76956dfdb28cd858c2d427a4748dd9183e5c043b /arch | |
| parent | e5a92362226e1685988bbf8d7ed50ab23453acc0 (diff) | |
| parent | abb3911965c1bd8eea305f64d4840a314259d96d (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9b9695322f56..ae07d261527c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -1692,7 +1692,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu, | |||
| 1692 | unsigned bank_num = mcg_cap & 0xff, bank; | 1692 | unsigned bank_num = mcg_cap & 0xff, bank; |
| 1693 | 1693 | ||
| 1694 | r = -EINVAL; | 1694 | r = -EINVAL; |
| 1695 | if (!bank_num) | 1695 | if (!bank_num || bank_num >= KVM_MAX_MCE_BANKS) |
| 1696 | goto out; | 1696 | goto out; |
| 1697 | if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000)) | 1697 | if (mcg_cap & ~(KVM_MCE_CAP_SUPPORTED | 0xff | 0xff0000)) |
| 1698 | goto out; | 1698 | goto out; |
| @@ -4051,7 +4051,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, | |||
| 4051 | return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu); | 4051 | return kvm_write_guest_virt(dtable.base + index*8, seg_desc, sizeof(*seg_desc), vcpu); |
| 4052 | } | 4052 | } |
| 4053 | 4053 | ||
| 4054 | static u32 get_tss_base_addr(struct kvm_vcpu *vcpu, | 4054 | static gpa_t get_tss_base_addr(struct kvm_vcpu *vcpu, |
| 4055 | struct desc_struct *seg_desc) | 4055 | struct desc_struct *seg_desc) |
| 4056 | { | 4056 | { |
| 4057 | u32 base_addr = get_desc_base(seg_desc); | 4057 | u32 base_addr = get_desc_base(seg_desc); |