Commit 2842076b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull kvm fix from Paolo Bonzini:

 - Fix NULL pointer read on s390 in ioctl(KVM_CHECK_EXTENSION) for
   /dev/kvm

* tag 'for-linus-6.9' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M
parents ba16c1cf 0a9c28be

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		break;

	case KVM_CAP_S390_HPAGE_1M:

		r = 0;

		if (hpage && !kvm_is_ucontrol(kvm))

		if (hpage && !(kvm && kvm_is_ucontrol(kvm)))

			r = 1;

		break;

	case KVM_CAP_S390_MEM_OP: