diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-07 13:01:39 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-07 13:01:39 -0400 |
| commit | 0a9c28bec202bbd14ae3fd184522490e5f5498b5 (patch) | |
| tree | 99bae9412e3849f89cab362fe0cbd5618dafeebd | |
| parent | 16c20208b9c2fff73015ad4e609072feafbf81ad (diff) | |
| parent | 175f2f5bcdfce9e728f1ff956a50f28824d28791 (diff) | |
| download | linux-stable-0a9c28bec202bbd14ae3fd184522490e5f5498b5.tar.gz linux-stable-0a9c28bec202bbd14ae3fd184522490e5f5498b5.tar.bz2 linux-stable-0a9c28bec202bbd14ae3fd184522490e5f5498b5.zip | |
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.
| -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: |