Skip to content

Commit 0a9c28b

Browse files
committed
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.
2 parents 16c2020 + 175f2f5 commit 0a9c28b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/kvm/kvm-s390.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
587587
break;
588588
case KVM_CAP_S390_HPAGE_1M:
589589
r = 0;
590-
if (hpage && !kvm_is_ucontrol(kvm))
590+
if (hpage && !(kvm && kvm_is_ucontrol(kvm)))
591591
r = 1;
592592
break;
593593
case KVM_CAP_S390_MEM_OP:

0 commit comments

Comments
 (0)