Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: s390: Fix for 6.9 

Fix wild read on capability check.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+SKTgaM0CPnbq/vKEXu8gLWmHHwFAmY55psACgkQEXu8gLWm
 HHxZBhAArM+cGB3ObHJQ80OagFsrvcC95wbdFpOLpLEryp+YIA49U6/VzFUc9HpM
 BoGtpwPDVQzO3KnAIQqqa467+kCmupj7hUvZEdpkRHacLXKgnW7Phdy8e2sXm1oj
 npO5xHHe7x3vEGAR0PeRbmeuOY84OpAlj1rOsoSf46j/r0UkdiO8lxXwN2q79i7O
 OSFJyN4/S8vaFIBYOAuAIIF3pF0+9BkKoqpaeMnGtvBjCmdTBcAV/5ymNMbonNtC
 BetGSirUg/zuaD9xKUqbyWxyr/2mfXMAmVZTG10mLXdSABoAk8JOyvhFqWDOhxWL
 fH6fK9EIEqx5xlAy/YCxz9T7XRSXqDEveIb/qZ6+2jw/kS7Y01rpTMo5BSn88JSg
 7VwmeR4Ikc6QVSkx6wCZivvnC+CMBDqzrv1eKtbWGaxaD6JwJFTUqB1O3DimY5KY
 T+g96VTSKyBvHwhXZPEGZJDJG/z7Zbchm2hhtUADFucNq74vH1e+i+4hzwa+n86+
 PUnEV6Hl+1ESNS4QCrBx1/hVA+TJ2+f5SD7JfL3rBbRz8sTOZvAsAytt+K3f6IeR
 HVnpMNbVWdrpaLdnIaPrT7KAZNzKhAyt1O8W3bZ57tNhN5V49pk/jE09ZLYpZD1x
 qVB5fIa5yaC7MEAmpnKGkoFPtVMOv038aeRJZPr2dcjqgp4wahM=
 =PKFv
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Paolo Bonzini 2024-05-07 13:01:39 -04:00
parent 16c20208b9 175f2f5bcd
commit 0a9c28bec2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kvm/kvm-s390.c
View File

@ -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: