From: David Hildenbrand <david@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, dvyukov@google.com
Subject: Re: [PATCH] kvm: fix page struct leak in handle_vmon
Date: Wed, 25 Jan 2017 10:57:28 +0100 [thread overview]
Message-ID: <cc4f0719-82c8-f35c-df7d-ad975a23a9b6@redhat.com> (raw)
In-Reply-To: <692606753.12365942.1485337926527.JavaMail.zimbra@redhat.com>
Am 25.01.2017 um 10:52 schrieb Paolo Bonzini:
>
>
> ----- Original Message -----
>> From: "David Hildenbrand" <david@redhat.com>
>> To: "Paolo Bonzini" <pbonzini@redhat.com>, linux-kernel@vger.kernel.org, kvm@vger.kernel.org
>> Cc: dvyukov@google.com
>> Sent: Wednesday, January 25, 2017 10:31:13 AM
>> Subject: Re: [PATCH] kvm: fix page struct leak in handle_vmon
>>
>> Am 24.01.2017 um 11:56 schrieb Paolo Bonzini:
>>> handle_vmon gets a reference on VMXON region page,
>>> but does not release it. Release the reference.
>>>
>>> Found by syzkaller; based on a patch by Dmitry.
>>>
>>> Reported-by: Dmitry Vyukov <dvyukov@google.com>
>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>> ---
>>> arch/x86/kvm/vmx.c | 9 +++++++--
>>> 1 file changed, 7 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
>>> index 42cc3d6f4d20..0f7345035210 100644
>>> --- a/arch/x86/kvm/vmx.c
>>> +++ b/arch/x86/kvm/vmx.c
>>> @@ -7085,13 +7085,18 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu
>>> *vcpu, int exit_reason,
>>> }
>>>
>>> page = nested_get_page(vcpu, vmptr);
>>> - if (page == NULL ||
>>> - *(u32 *)kmap(page) != VMCS12_REVISION) {
>>> + if (page == NULL) {
>>> nested_vmx_failInvalid(vcpu);
>>> + return kvm_skip_emulated_instruction(vcpu);
>>> + }
>>> + if (*(u32 *)kmap(page) != VMCS12_REVISION) {
>>
>> shouldn't we also check if kmap even returned a valid pointer before
>> dereferencing it?
>
> I don't think kmap can fail (page_address can)?
Then I wonder why there are some checks:
e.g. nested_vmx_merge_msr_bitmap()
msr_bitmap_l1 = (unsigned long *)kmap(page);
if (!msr_bitmap_l1) {
// no unmap
...
return false;
or vmx_complete_nested_posted_interrupt()
vapic_page = kmap(vmx->nested.virtual_apic_page);
if (!vapic_page) {
// no unmap
...
return -ENOMEM;
But there is also no check in handle_vmptrld() for example.
>
> Paolo
--
David
next prev parent reply other threads:[~2017-01-25 9:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 10:56 [PATCH] kvm: fix page struct leak in handle_vmon Paolo Bonzini
2017-01-25 9:31 ` David Hildenbrand
2017-01-25 9:52 ` Paolo Bonzini
2017-01-25 9:57 ` David Hildenbrand [this message]
2017-01-25 10:11 ` David Hildenbrand
2017-01-25 10:35 ` Paolo Bonzini
2017-01-25 10:11 ` David Hildenbrand
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=cc4f0719-82c8-f35c-df7d-ad975a23a9b6@redhat.com \
--to=david@redhat.com \
--cc=dvyukov@google.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;
as well as URLs for NNTP newsgroup(s).