Commit 0a9c28be authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-6.9-1' of... 

Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fix for 6.9

Fix wild read on capability check.
parents 16c20208 175f2f5b

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: