Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/kvms390/linux into HEAD KVM: s390: Fix for 6.9 Fix wild read on capability check.
Evolinx-Linux · May 7, 2024 · 0a9c28b · 0a9c28b
2 parents 16c2020 + 175f2f5
commit 0a9c28b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
@@ -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: