[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 20/25] x86: Fix x86_cpu_new() error API violations
From: |
Igor Mammedov |
Subject: |
Re: [PATCH v2 20/25] x86: Fix x86_cpu_new() error API violations |
Date: |
Wed, 24 Jun 2020 16:17:03 +0200 |
On Wed, 24 Jun 2020 10:37:32 +0200
Markus Armbruster <armbru@redhat.com> wrote:
> 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(). Harmless, because the former can't actually fail
> here.
>
> Fix by checking for failure right away. While there, replace
> qdev_realize(); object_unref() by qdev_realize_and_unref().
>
> 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>
> ---
> hw/i386/x86.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 34229b45c7..3a7029e6db 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -118,16 +118,10 @@ uint32_t x86_cpu_apic_id_from_index(X86MachineState
> *x86ms,
>
> void x86_cpu_new(X86MachineState *x86ms, int64_t apic_id, Error **errp)
> {
> - Object *cpu = 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);
> - qdev_realize(DEVICE(cpu), NULL, &local_err);
> -
> - object_unref(cpu);
> - error_propagate(errp, local_err);
> + object_property_set_uint(cpu, apic_id, "apic-id", &error_abort);
it may fail here if user specified wrong cpu flags, but there is nothing we can
do to fix it.
perhaps error_fatal would suit this case better?
> + qdev_realize_and_unref(DEVICE(cpu), NULL, errp);
> }
>
> void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)
- [PATCH v2 14/25] qdev: Drop qbus_set_hotplug_handler() parameter @errp, (continued)
- [PATCH v2 14/25] qdev: Drop qbus_set_hotplug_handler() parameter @errp, Markus Armbruster, 2020/06/24
- [PATCH v2 03/25] Clean up some calls to ignore Error objects the right way, Markus Armbruster, 2020/06/24
- [PATCH v2 04/25] tests: Use &error_abort where appropriate, Markus Armbruster, 2020/06/24
- [PATCH v2 13/25] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp, Markus Armbruster, 2020/06/24
- [PATCH v2 12/25] aspeed: Clean up roundabout error propagation, Markus Armbruster, 2020/06/24
- [PATCH v2 09/25] sd/milkymist-memcard: Plug minor memory leak in realize, Markus Armbruster, 2020/06/24
- [PATCH v2 08/25] qga: Plug unlikely memory leak in guest-set-memory-blocks, Markus Armbruster, 2020/06/24
- [PATCH v2 20/25] x86: Fix x86_cpu_new() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 06/25] usb/dev-mtp: Fix Error double free after inotify failure, Markus Armbruster, 2020/06/24
- [PATCH v2 17/25] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 19/25] mips/cps: Fix mips_cps_realize() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 02/25] pci: Delete useless error_propagate(), Markus Armbruster, 2020/06/24
- [PATCH v2 01/25] net/virtio: Fix failover_replug_primary() return value regression, Markus Armbruster, 2020/06/24
- [PATCH v2 18/25] riscv_hart: Fix riscv_harts_realize() error API violations, Markus Armbruster, 2020/06/24