| From 204c97245612b6c255edf4e21e24d417c4a0c008 Mon Sep 17 00:00:00 2001 |
| From: Pierre Morel <pmorel@linux.ibm.com> |
| Date: Thu, 23 Aug 2018 12:25:54 +0200 |
| Subject: KVM: s390: vsie: copy wrapping keys to right place |
| |
| From: Pierre Morel <pmorel@linux.ibm.com> |
| |
| 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> |
| |
| --- |
| arch/s390/kvm/vsie.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/s390/kvm/vsie.c |
| +++ b/arch/s390/kvm/vsie.c |
| @@ -170,7 +170,8 @@ static int shadow_crycb(struct kvm_vcpu |
| 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; |
