From: Paolo Bonzini <pbonzini@redhat.com>
To: Sean Christopherson <seanjc@google.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Brijesh Singh <brijesh.singh@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Ashish Kalra <ashish.kalra@amd.com>
Subject: Re: [PATCH] KVM: SVM: Invert user pointer casting in SEV {en,de}crypt helpers
Date: Fri, 7 May 2021 09:40:54 +0200 [thread overview]
Message-ID: <38d86d4c-6578-18f6-067c-a6386c5c8005@redhat.com> (raw)
In-Reply-To: <20210506231542.2331138-1-seanjc@google.com>
On 07/05/21 01:15, Sean Christopherson wrote:
> Invert the user pointer params for SEV's helpers for encrypting and
> decrypting guest memory so that they take a pointer and cast to an
> unsigned long as necessary, as opposed to doing the opposite. Tagging a
> non-pointer as __user is confusing and weird since a cast of some form
> needs to occur to actually access the user data. This also fixes Sparse
> warnings triggered by directly consuming the unsigned longs, which are
> "noderef" due to the __user tag.
>
> Cc: Brijesh Singh <brijesh.singh@amd.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Ashish Kalra <ashish.kalra@amd.com>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> arch/x86/kvm/svm/sev.c | 24 +++++++++++-------------
> 1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index a9d8d6aafdb8..bba4544fbaba 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -763,7 +763,7 @@ static int __sev_dbg_decrypt(struct kvm *kvm, unsigned long src_paddr,
> }
>
> static int __sev_dbg_decrypt_user(struct kvm *kvm, unsigned long paddr,
> - unsigned long __user dst_uaddr,
> + void __user *dst_uaddr,
> unsigned long dst_paddr,
> int size, int *err)
> {
> @@ -787,8 +787,7 @@ static int __sev_dbg_decrypt_user(struct kvm *kvm, unsigned long paddr,
>
> if (tpage) {
> offset = paddr & 15;
> - if (copy_to_user((void __user *)(uintptr_t)dst_uaddr,
> - page_address(tpage) + offset, size))
> + if (copy_to_user(dst_uaddr, page_address(tpage) + offset, size))
> ret = -EFAULT;
> }
>
> @@ -800,9 +799,9 @@ static int __sev_dbg_decrypt_user(struct kvm *kvm, unsigned long paddr,
> }
>
> static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr,
> - unsigned long __user vaddr,
> + void __user *vaddr,
> unsigned long dst_paddr,
> - unsigned long __user dst_vaddr,
> + void __user *dst_vaddr,
> int size, int *error)
> {
> struct page *src_tpage = NULL;
> @@ -810,13 +809,12 @@ static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr,
> int ret, len = size;
>
> /* If source buffer is not aligned then use an intermediate buffer */
> - if (!IS_ALIGNED(vaddr, 16)) {
> + if (!IS_ALIGNED((unsigned long)vaddr, 16)) {
> src_tpage = alloc_page(GFP_KERNEL);
> if (!src_tpage)
> return -ENOMEM;
>
> - if (copy_from_user(page_address(src_tpage),
> - (void __user *)(uintptr_t)vaddr, size)) {
> + if (copy_from_user(page_address(src_tpage), vaddr, size)) {
> __free_page(src_tpage);
> return -EFAULT;
> }
> @@ -830,7 +828,7 @@ static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr,
> * - copy the source buffer in an intermediate buffer
> * - use the intermediate buffer as source buffer
> */
> - if (!IS_ALIGNED(dst_vaddr, 16) || !IS_ALIGNED(size, 16)) {
> + if (!IS_ALIGNED((unsigned long)dst_vaddr, 16) || !IS_ALIGNED(size, 16)) {
> int dst_offset;
>
> dst_tpage = alloc_page(GFP_KERNEL);
> @@ -855,7 +853,7 @@ static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr,
> page_address(src_tpage), size);
> else {
> if (copy_from_user(page_address(dst_tpage) + dst_offset,
> - (void __user *)(uintptr_t)vaddr, size)) {
> + vaddr, size)) {
> ret = -EFAULT;
> goto e_free;
> }
> @@ -935,15 +933,15 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec)
> if (dec)
> ret = __sev_dbg_decrypt_user(kvm,
> __sme_page_pa(src_p[0]) + s_off,
> - dst_vaddr,
> + (void __user *)dst_vaddr,
> __sme_page_pa(dst_p[0]) + d_off,
> len, &argp->error);
> else
> ret = __sev_dbg_encrypt_user(kvm,
> __sme_page_pa(src_p[0]) + s_off,
> - vaddr,
> + (void __user *)vaddr,
> __sme_page_pa(dst_p[0]) + d_off,
> - dst_vaddr,
> + (void __user *)dst_vaddr,
> len, &argp->error);
>
> sev_unpin_memory(kvm, src_p, n);
>
Queued, thnaks.
Paolo
prev parent reply other threads:[~2021-05-07 7:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 23:15 Sean Christopherson
2021-05-07 7:40 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38d86d4c-6578-18f6-067c-a6386c5c8005@redhat.com \
--to=pbonzini@redhat.com \
--cc=ashish.kalra@amd.com \
--cc=brijesh.singh@amd.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seanjc@google.com \
--cc=thomas.lendacky@amd.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®