hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: s390: Fix crypto handling for nested KVM 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJcam53AAoJEBF7vIC1phx8UrQP/R+7FMgCzL/vafjX1wjgRVP4
 iXUeGri/Y4UnZiiZxHBgUZAjRI+HbZjNddaEVnRpAj1wGfyS94uqSQjJ8an/SSi0
 CRAfNWxzD5sHpqfrTO/QT/AVwiQjb+1xf9ysTrmjG80O5VEa5SPBs+Fl2nOSnFlj
 cf58ao7clvhXymiLObRyocX/knV9fp8SCSlWjrmgSJRY0wtv+QmzneQCeTdShmHA
 Ke46AJ6+k6W3mIub6hPX9gaqhmVlopOiTx4yRBv88cHHhY29FxTFpdpuhZFtbPWi
 dBwpwz5yz6YIF70/VqHBnrF4+ptfvWNzzl8cezaVW4QYMAVSudHxQmikiZu6Ajcm
 PA0D6KY+TNQyHH8Uj7r+GzfPptnzhn3d9Gc4w1UfCwnAIMo51X7yeKOeobEwEOS7
 kuXii1GcbDeJvEI5mBn5hYCaOLPLNJ7xmnPwwYfi4bUlOuSjZ4EJJRfhElxiK5kQ
 adksPMip1UsWbQzeHkp5TtPyBpFr+xM/lvECuZgC49ZtAFPAmX44/BHEbbLJLqHI
 ucPRZwWcZyzJuNOBgLmghBJ62G9weBLAQ4spzHL/o2/xXXDd3oFx3ELmKgUQgmOL
 di4DVcbTsBDOcCWb+hfs0zS/EhDSpUWpOaQJxQGq+jFByC8DgmXJeVYDgT3H/DsB
 wTys07zIkmDNkpXPaPvK
 =pirn
 -----END PGP SIGNATURE-----

Merge tag 'kvm-s390-master-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

KVM: s390: Fix crypto handling for nested KVM
This commit is contained in:
Paolo Bonzini 2019-02-20 23:48:55 +01:00
parent a3b22b9f11 b10bd9a256
commit 73de65f5b9
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/vsie.c
View File

@ -297,7 +297,7 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
scb_s->crycbd = 0;
apie_h = vcpu->arch.sie_block->eca & ECA_APIE;
if (!apie_h && !key_msk)
if (!apie_h && (!key_msk || fmt_o == CRYCB_FORMAT0))
return 0;
if (!crycb_addr)