diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-20 23:48:55 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-20 23:48:55 +0100 |
| commit | 73de65f5b9de517d8d9251a755e91296dd521ca6 (patch) | |
| tree | 07604f2313365ba521da9d9eb0a908299daca6ca | |
| parent | a3b22b9f11d9fbc48b0291ea92259a5a810e9438 (diff) | |
| parent | b10bd9a256aec504c14a7c9b6fccb6301ecf290a (diff) | |
| download | linux-stable-73de65f5b9de517d8d9251a755e91296dd521ca6.tar.gz linux-stable-73de65f5b9de517d8d9251a755e91296dd521ca6.tar.bz2 linux-stable-73de65f5b9de517d8d9251a755e91296dd521ca6.zip | |
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
| -rw-r--r-- | arch/s390/kvm/vsie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index a153257bf7d9..d62fa148558b 100644 --- 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) |