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
mariux64 · Feb 20, 2019 · 73de65f · 73de65f
2 parents a3b22b9 + b10bd9a
commit 73de65f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
@@ -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)