Commit 24556728 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Two small fixes for x86:

   - lockdep WARN due to missing lock nesting annotation

   - NULL pointer dereference when accessing debugfs"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Check for rmaps allocation
  KVM: SEV: Mark nested locking of kvm->lock
parents 7a6043cc fffb5323

arch/x86/kvm/debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ static int kvm_mmu_rmaps_stat_show(struct seq_file *m, void *v) 
	unsigned int *log[KVM_NR_PAGE_SIZES], *cur;

	int i, j, k, l, ret;



	if (!kvm_memslots_have_rmaps(kvm))

		return 0;



	ret = -ENOMEM;

	memset(log, 0, sizeof(log));

	for (i = 0; i < KVM_NR_PAGE_SIZES; i++) {

arch/x86/kvm/svm/sev.c

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ static int sev_lock_two_vms(struct kvm *dst_kvm, struct kvm *src_kvm) 
	r = -EINTR;

	if (mutex_lock_killable(&dst_kvm->lock))

		goto release_src;

	if (mutex_lock_killable(&src_kvm->lock))

	if (mutex_lock_killable_nested(&src_kvm->lock, SINGLE_DEPTH_NESTING))

		goto unlock_dst;

	return 0;