diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:18:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:18:18 -0700 |
| commit | 20ba5efb9c788cb3308c8711757848cf0e596529 (patch) | |
| tree | 490a570bc2538c6a93588eafc7a72411ac10535e | |
| parent | ab08937400eabe862f58974ad031a86c4ea2903a (diff) | |
| parent | 7a73c0283dadf1cf360a79de396ff0962e781b60 (diff) | |
| download | linux-3.10-20ba5efb9c788cb3308c8711757848cf0e596529.tar.gz linux-3.10-20ba5efb9c788cb3308c8711757848cf0e596529.tar.bz2 linux-3.10-20ba5efb9c788cb3308c8711757848cf0e596529.zip | |
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Use kmalloc() instead of vmalloc() for KVM_[GS]ET_MSR
KVM: MMU: fix conflict access permissions in direct sp
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 1 | ||||
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 89d66ca4d87..2331bdc2b54 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -342,6 +342,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, /* advance table_gfn when emulating 1gb pages with 4k */ if (delta == 0) table_gfn += PT_INDEX(addr, level); + access &= gw->pte_access; } else { direct = 0; table_gfn = gw->table_gfn[level - 2]; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 05d571f6f19..7fa89c39c64 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1562,7 +1562,7 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, r = -ENOMEM; size = sizeof(struct kvm_msr_entry) * msrs.nmsrs; - entries = vmalloc(size); + entries = kmalloc(size, GFP_KERNEL); if (!entries) goto out; @@ -1581,7 +1581,7 @@ static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs, r = n; out_free: - vfree(entries); + kfree(entries); out: return r; } |