Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82e8da1f authored by David Rientjes's avatar David Rientjes Committed by Greg Kroah-Hartman
Browse files

KVM: SVM: prevent DBG_DECRYPT and DBG_ENCRYPT overflow 



[ Upstream commit b86bc2858b389255cd44555ce4b1e427b2b770c0 ]

This ensures that the address and length provided to DBG_DECRYPT and
DBG_ENCRYPT do not cause an overflow.

At the same time, pass the actual number of pages pinned in memory to
sev_unpin_memory() as a cleanup.

Reported-by: default avatarCfir Cohen <cfir@google.com>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 57186663

arch/x86/kvm/svm.c

+9 −3
Original line number Diff line number Diff line
@@ -6789,7 +6789,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) 
	struct page **src_p, **dst_p;

	struct kvm_sev_dbg debug;

	unsigned long n;

	int ret, size;

	unsigned int size;

	int ret;



	if (!sev_guest(kvm))

		return -ENOTTY;
@@ -6797,6 +6798,11 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) 
	if (copy_from_user(&debug, (void __user *)(uintptr_t)argp->data, sizeof(debug)))

		return -EFAULT;



	if (!debug.len || debug.src_uaddr + debug.len < debug.src_uaddr)

		return -EINVAL;

	if (!debug.dst_uaddr)

		return -EINVAL;



	vaddr = debug.src_uaddr;

	size = debug.len;

	vaddr_end = vaddr + size;
@@ -6847,8 +6853,8 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) 
						     dst_vaddr,

						     len, &argp->error);



		sev_unpin_memory(kvm, src_p, 1);

		sev_unpin_memory(kvm, dst_p, 1);

		sev_unpin_memory(kvm, src_p, n);

		sev_unpin_memory(kvm, dst_p, n);



		if (ret)

			goto err;