From: Marc-André Lureau <[email protected]>
Add instance_finalize to free the two pflash devices (when unrealized)
and the OEM ID strings allocated during instance_init. Fixes leaks
found by ASan.
Fixes: 71eb522c4063 ("riscv/virt: Add the PFlash CFI01 device")
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Signed-off-by: Marc-André Lureau <[email protected]>
---
hw/riscv/virt.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index a1c323e66df..315049bc86c 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1745,6 +1745,19 @@ static void virt_machine_init(MachineState *machine)
qemu_add_machine_init_done_notifier(&s->machine_done);
}
+static void virt_machine_instance_finalize(Object *obj)
+{
+ RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
+
+ for (int i = 0; i < ARRAY_SIZE(s->flash); i++) {
+ if (s->flash[i] && !qdev_is_realized(DEVICE(s->flash[i]))) {
+ object_unref(OBJECT(s->flash[i]));
+ }
+ }
+ g_free(s->oem_id);
+ g_free(s->oem_table_id);
+}
+
static void virt_machine_instance_init(Object *obj)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
@@ -1984,6 +1997,7 @@ static const TypeInfo virt_machine_typeinfo = {
.parent = TYPE_MACHINE,
.class_init = virt_machine_class_init,
.instance_init = virt_machine_instance_init,
+ .instance_finalize = virt_machine_instance_finalize,
.instance_size = sizeof(RISCVVirtState),
.interfaces = (const InterfaceInfo[]) {
{ TYPE_HOTPLUG_HANDLER },
--
2.54.0
