From: Maxim Levitsky <mlevitsk@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: Re: [PATCH] KVM: x86: do not pass poisoned hva to __kvm_set_memory_region
Date: Thu, 11 Jun 2020 23:14:01 +0300 [thread overview]
Message-ID: <bccfe20ca818020ea982bc383f1fabe51a127268.camel@redhat.com> (raw)
In-Reply-To: <20200611180159.26085-1-pbonzini@redhat.com>
On Thu, 2020-06-11 at 14:01 -0400, Paolo Bonzini wrote:
> __kvm_set_memory_region does not use the hva at all, so trying to
> catch use-after-delete is pointless and, worse, it fails access_ok
> now that we apply it to all memslots including private kernel ones.
> This fixes an AVIC regression.
>
> Fixes: 09d952c971a5 ("KVM: check userspace_addr for all memslots", 2020-06-01)
> Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/x86.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 290784ba63e4..00c88c2f34e4 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -9951,13 +9951,8 @@ int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size)
> if (!slot || !slot->npages)
> return 0;
>
> - /*
> - * Stuff a non-canonical value to catch use-after-delete. This
> - * ends up being 0 on 32-bit KVM, but there's no better
> - * alternative.
> - */
> - hva = (unsigned long)(0xdeadull << 48);
> old_npages = slot->npages;
> + hva = 0;
> }
>
> for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
Under assumption that we can assume that access_ok(0,0) is safe to assume
to be always true:
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
I also tested exactly this solution when triaging this bug and it works,
but I wasn't sure that this is the correct solution.
Best regards,
Maxim Levitsky
prev parent reply other threads:[~2020-06-11 20:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 18:01 Paolo Bonzini
2020-06-11 20:14 ` Maxim Levitsky [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=bccfe20ca818020ea982bc383f1fabe51a127268.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.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®