Commit 204c9724 authored Aug 23, 2018 by Pierre Morel Committed by Christian Borntraeger Sep 04, 2018

KVM: s390: vsie: copy wrapping keys to right place



Copy the key mask to the right offset inside the shadow CRYCB

Fixes: bbeaa58b ("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>

parent a11bdb1a

arch/s390/kvm/vsie.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,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;