diff options
| author | Pierre Morel <pmorel@linux.ibm.com> | 2018-08-23 12:25:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-19 22:43:36 +0200 |
| commit | d5fca5314c4da9d17b2db5d01a57fce48ec0f081 (patch) | |
| tree | db36a0ff9fcef6ec5e8551c6ab4aea0d81c3376b /arch | |
| parent | ae3968b416459f3754feefb0bc685e9f3261bb3e (diff) | |
| download | linux-exynos-d5fca5314c4da9d17b2db5d01a57fce48ec0f081.tar.gz linux-exynos-d5fca5314c4da9d17b2db5d01a57fce48ec0f081.tar.bz2 linux-exynos-d5fca5314c4da9d17b2db5d01a57fce48ec0f081.zip | |
KVM: s390: vsie: copy wrapping keys to right place
commit 204c97245612b6c255edf4e21e24d417c4a0c008 upstream.
Copy the key mask to the right offset inside the shadow CRYCB
Fixes: bbeaa58b3 ("KVM: s390: vsie: support aes dea wrapping keys")
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Cc: stable@vger.kernel.org # v4.8+
Message-Id: <1535019956-23539-2-git-send-email-pmorel@linux.ibm.com>
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kvm/vsie.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 4f1f5fc8139d..061906f98dc5 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -170,7 +170,8 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) return set_validity_icpt(scb_s, 0x0039U); /* copy only the wrapping keys */ - if (read_guest_real(vcpu, crycb_addr + 72, &vsie_page->crycb, 56)) + if (read_guest_real(vcpu, crycb_addr + 72, + vsie_page->crycb.dea_wrapping_key_mask, 56)) return set_validity_icpt(scb_s, 0x0035U); scb_s->ecb3 |= ecb3_flags; |