Skip to content

Commit 2842076

Browse files
committed
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
2 parents ba16c1c + 0a9c28b commit 2842076

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/kvm/kvm-s390.c

+1-1
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)