diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-05-12 12:15:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-05-12 12:15:39 -0700 |
| commit | 2842076beb698b8b5f76aa9c987f4aa95b0e74d7 (patch) | |
| tree | 284172342e9fda3b29b6a54be3d79e7f940c132c /arch | |
| parent | Merge tag 'edac_urgent_for_v6.9' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-2842076beb698b8b5f76aa9c987f4aa95b0e74d7.tar.gz linux-2842076beb698b8b5f76aa9c987f4aa95b0e74d7.tar.bz2 linux-2842076beb698b8b5f76aa9c987f4aa95b0e74d7.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 5147b943a864..7721eb522f43 100644 --- 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: |