From: Eduardo Habkost <ehabkost@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>,
rth@twiddle.net, qemu-devel@nongnu.org, armbru@redhat.com,
mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size()
Date: Thu, 20 Jun 2019 22:46:15 -0300 [thread overview]
Message-ID: <20190621014615.GF1862@habkost.net> (raw)
In-Reply-To: <9712632a-e84c-f88e-76d3-9ddc402b8256@redhat.com>
On Fri, Jun 21, 2019 at 02:29:29AM +0200, Paolo Bonzini wrote:
> On 10/06/19 15:50, Igor Mammedov wrote:
> > QEMU will crash when device-memory-region-size property is read if ms->device_memory
> > wasn't initialized yet.
> >
> > Crash can be reproduced with:
> > $QEMU -preconfig -qmp unix:qmp_socket,server,nowait &
> > ./scripts/qmp/qom-get -s qmp_socket /machine.device-memory-region-size
> >
> > Instead of crashing return 0 if ms->device_memory hasn't been initialized.
>
> This patch breaks bios-tables-test /x86_64/acpi/piix64/cpuhp:
>
> acpi-test: Warning! SRAT binary file mismatch. Actual [aml:/tmp/aml-RIFK3Z], Expected [aml:tests/data/acpi/pc/SRAT.memhp].
> acpi-test: Warning! SRAT mismatch. Actual [asl:/tmp/asl-TLFK3Z.dsl, aml:/tmp/aml-RIFK3Z], Expected [asl:/tmp/asl-JL5J3Z.dsl, aml:tests/data/acpi/pc/SRAT.memhp].
> **
> ERROR:/home/pbonzini/work/upstream/qemu/tests/bios-tables-test.c:434:test_acpi_asl: assertion failed: (all_tables_match)
> ERROR - Bail out! ERROR:/home/pbonzini/work/upstream/qemu/tests/bios-tables-test.c:434:test_acpi_asl: assertion failed: (all_tables_match)
>
> So I'm removing it from the pull request.
The patch makes all memory regions return 0 as its size.
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v2:
> > add reproducer to commit message
> > (Markus Armbruster <armbru@redhat.com>)
> >
> > hw/i386/pc.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > index edc240b..1b7ead9 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -2459,7 +2459,11 @@ pc_machine_get_device_memory_region_size(Object *obj, Visitor *v,
> > Error **errp)
> > {
> > MachineState *ms = MACHINE(obj);
> > - int64_t value = memory_region_size(&ms->device_memory->mr);
> > + int64_t value = 0;
> > +
> > + if (ms->device_memory) {
> > + memory_region_size(&ms->device_memory->mr);
This was supposed to be:
value = memory_region_size(&ms->device_memory->mr);
> > + }
> >
> > visit_type_int(v, name, &value, errp);
> > }
> >
>
--
Eduardo
next prev parent reply other threads:[~2019-06-21 2:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 13:50 [Qemu-devel] [PATCH] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size() Igor Mammedov
2019-06-10 13:57 ` Paolo Bonzini
2019-06-21 0:29 ` Paolo Bonzini
2019-06-21 1:46 ` Eduardo Habkost [this message]
2019-06-24 9:01 ` Igor Mammedov
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=20190621014615.GF1862@habkost.net \
--to=ehabkost@redhat.com \
--cc=armbru@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).