[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/28] x86: Fix x86_cpu_new() error handling
From: |
Markus Armbruster |
Subject: |
[PULL 22/28] x86: Fix x86_cpu_new() error handling |
Date: |
Thu, 2 Jul 2020 13:09:25 +0200 |
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>
---
hw/i386/x86.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 34229b45c7..93f7371a56 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -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)
{
- Object *cpu = NULL;
Error *local_err = NULL;
-
- cpu = object_new(MACHINE(x86ms)->cpu_type);
+ Object *cpu = object_new(MACHINE(x86ms)->cpu_type);
object_property_set_uint(cpu, apic_id, "apic-id", &local_err);
+ if (local_err) {
+ goto out;
+ }
qdev_realize(DEVICE(cpu), NULL, &local_err);
+out:
object_unref(cpu);
error_propagate(errp, local_err);
}
--
2.26.2
- [PULL 00/28] Error reporting patches patches for 2020-07-02, Markus Armbruster, 2020/07/02
- [PULL 01/28] chardev/tcp: Fix error message double free error, Markus Armbruster, 2020/07/02
- [PULL 06/28] tests: Use &error_abort where appropriate, Markus Armbruster, 2020/07/02
- [PULL 12/28] test-util-filemonitor: Plug unlikely memory leak, Markus Armbruster, 2020/07/02
- [PULL 07/28] tests: Use error_free_or_abort() where appropriate, Markus Armbruster, 2020/07/02
- [PULL 02/28] hw/virtio/virtio-iommu-pci.c: Fix typo in error message, Markus Armbruster, 2020/07/02
- [PULL 15/28] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp, Markus Armbruster, 2020/07/02
- [PULL 14/28] aspeed: Clean up roundabout error propagation, Markus Armbruster, 2020/07/02
- [PULL 20/28] riscv_hart: Fix riscv_harts_realize() error API violations, Markus Armbruster, 2020/07/02
- [PULL 08/28] usb/dev-mtp: Fix Error double free after inotify failure, Markus Armbruster, 2020/07/02
- [PULL 22/28] x86: Fix x86_cpu_new() error handling,
Markus Armbruster <=
- [PULL 10/28] qga: Plug unlikely memory leak in guest-set-memory-blocks, Markus Armbruster, 2020/07/02
- [PULL 11/28] sd/milkymist-memcard: Plug minor memory leak in realize, Markus Armbruster, 2020/07/02
- [PULL 13/28] vnc: Plug minor memory leak in vnc_display_open(), Markus Armbruster, 2020/07/02
- [PULL 16/28] qdev: Drop qbus_set_hotplug_handler() parameter @errp, Markus Armbruster, 2020/07/02
- [PULL 28/28] migration/rdma: Plug memory leaks in qemu_rdma_registration_stop(), Markus Armbruster, 2020/07/02
- [PULL 19/28] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, Markus Armbruster, 2020/07/02
- [PULL 03/28] net/virtio: Fix failover_replug_primary() return value regression, Markus Armbruster, 2020/07/02
- [PULL 04/28] pci: Delete useless error_propagate(), Markus Armbruster, 2020/07/02
- [PULL 23/28] amd_iommu: Fix amdvi_realize() error API violation, Markus Armbruster, 2020/07/02
- [PULL 05/28] Clean up some calls to ignore Error objects the right way, Markus Armbruster, 2020/07/02