Commit 73de65f5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.0' of... 

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
parents a3b22b9f b10bd9a2

arch/s390/kvm/vsie.c

+1 −1
Original line number Diff line number Diff line
@@ -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)