Skip to content

Commit 5b836d0

Browse files
committed
hm/nvram/xlnx-versal-efuse-ctrl: Call register_finalize_block
The TYPE_XLNX_VERSAL_EFUSE_CTRL device creates a register block with register_init_block32() in its instance_init method; we must therefore destroy it in our instance_finalize method to avoid a leak in the QOM introspection "init-inspect-finalize" lifecycle: Direct leak of 304 byte(s) in 1 object(s) allocated from: #0 0x55f222b5b9d8 in __interceptor_calloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-aarch64+0x294e9d8) (BuildId: 420 43d49e1139e3f3071b1f22fac1e3e7249c9a6) #1 0x7fbb10669c50 in g_malloc0 debian/build/deb/../../../glib/gmem.c:161:13 #2 0x55f222f90c5d in register_init_block hw/core/register.c:248:34 #3 0x55f222f916be in register_init_block32 hw/core/register.c:299:12 #4 0x55f223bbdd15 in efuse_ctrl_init hw/nvram/xlnx-versal-efuse-ctrl.c:718:9 qemu#5 0x55f225b23391 in object_init_with_type qom/object.c:420:9 qemu#6 0x55f225b0a66b in object_initialize_with_type qom/object.c:562:5 qemu#7 0x55f225b0bf0d in object_new_with_type qom/object.c:782:5 qemu#8 0x55f225b0bfe1 in object_new qom/object.c:797:12 qemu#9 0x55f226309e0d in qmp_device_list_properties qom/qom-qmp-cmds.c:144:11 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-id: 20240822162127.705879-7-peter.maydell@linaro.org
1 parent 14bfca0 commit 5b836d0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

hw/nvram/xlnx-versal-efuse-ctrl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,24 +712,24 @@ static void efuse_ctrl_init(Object *obj)
712712
{
713713
XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj);
714714
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
715-
RegisterInfoArray *reg_array;
716715

717-
reg_array =
716+
s->reg_array =
718717
register_init_block32(DEVICE(obj), efuse_ctrl_regs_info,
719718
ARRAY_SIZE(efuse_ctrl_regs_info),
720719
s->regs_info, s->regs,
721720
&efuse_ctrl_ops,
722721
XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG,
723722
R_MAX * 4);
724723

725-
sysbus_init_mmio(sbd, &reg_array->mem);
724+
sysbus_init_mmio(sbd, &s->reg_array->mem);
726725
sysbus_init_irq(sbd, &s->irq_efuse_imr);
727726
}
728727

729728
static void efuse_ctrl_finalize(Object *obj)
730729
{
731730
XlnxVersalEFuseCtrl *s = XLNX_VERSAL_EFUSE_CTRL(obj);
732731

732+
register_finalize_block(s->reg_array);
733733
g_free(s->extra_pg0_lock_spec);
734734
}
735735

include/hw/nvram/xlnx-versal-efuse.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ struct XlnxVersalEFuseCtrl {
4444
void *extra_pg0_lock_spec; /* Opaque property */
4545
uint32_t extra_pg0_lock_n16;
4646

47+
RegisterInfoArray *reg_array;
4748
uint32_t regs[XLNX_VERSAL_EFUSE_CTRL_R_MAX];
4849
RegisterInfo regs_info[XLNX_VERSAL_EFUSE_CTRL_R_MAX];
4950
};

0 commit comments

Comments
 (0)