motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Fix x86_cpu_new() error handling

Browse source 
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.

x86_cpu_new() is wrong that way: it passes &local_err to
object_property_set_uint() without checking it, and then to
qdev_realize().  If both fail, we'll trip error_setv()'s assertion.
To assess the bug's impact, we'd need to figure out how to make both
calls fail.  Too much work for ignorant me, sorry.

Fix by checking for failure right away.

Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200630090351.1247703-21-armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-30 11:03:45 +02:00
parent 81f66cfd24
commit 18d588fe1e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/i386/x86.c
View file

@ -118,14 +118,16 @@ uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms,
void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp) void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp)
{ {
Object *cpu = NULL;
Error *local_err = NULL; Error *local_err = NULL;
Object *cpu = object_new(MACHINE(x86ms)->cpu_type);
cpu = object_new(MACHINE(x86ms)->cpu_type);
object_property_set_uint(cpu, apic_id, "apic-id", &local_err); object_property_set_uint(cpu, apic_id, "apic-id", &local_err);
if (local_err) {
goto out;
}
qdev_realize(DEVICE(cpu), NULL, &local_err); qdev_realize(DEVICE(cpu), NULL, &local_err);
out:
object_unref(cpu); object_unref(cpu);
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }