Commit 20ba5efb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ab089374 7a73c028

arch/x86/kvm/paging_tmpl.h

+1 −0
Original line number Diff line number Diff line
@@ -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];

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}