[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/25] hw/arm/sbsa-ref: Don't leak string in sbsa_fdt_add_gic_node
From: |
Peter Maydell |
Subject: |
[PULL 20/25] hw/arm/sbsa-ref: Don't leak string in sbsa_fdt_add_gic_node() |
Date: |
Thu, 5 Sep 2024 14:00:55 +0100 |
In sbsa_fdt_add_gic_node() we g_strdup_printf() two nodename
strings, but only free one.
Since the string is actually entirely constant and we don't
make any use of printf's format-string operations, we can
drop the g_strdup_printf() use entirely.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20240822162323.706382-1-peter.maydell@linaro.org
---
hw/arm/sbsa-ref.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 396abe9c1bd..e3195d54497 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -164,23 +164,20 @@ static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState
*sms, int idx)
static void sbsa_fdt_add_gic_node(SBSAMachineState *sms)
{
- char *nodename;
+ const char *intc_nodename = "/intc";
+ const char *its_nodename = "/intc/its";
- nodename = g_strdup_printf("/intc");
- qemu_fdt_add_subnode(sms->fdt, nodename);
- qemu_fdt_setprop_sized_cells(sms->fdt, nodename, "reg",
+ qemu_fdt_add_subnode(sms->fdt, intc_nodename);
+ qemu_fdt_setprop_sized_cells(sms->fdt, intc_nodename, "reg",
2, sbsa_ref_memmap[SBSA_GIC_DIST].base,
2, sbsa_ref_memmap[SBSA_GIC_DIST].size,
2, sbsa_ref_memmap[SBSA_GIC_REDIST].base,
2, sbsa_ref_memmap[SBSA_GIC_REDIST].size);
- nodename = g_strdup_printf("/intc/its");
- qemu_fdt_add_subnode(sms->fdt, nodename);
- qemu_fdt_setprop_sized_cells(sms->fdt, nodename, "reg",
+ qemu_fdt_add_subnode(sms->fdt, its_nodename);
+ qemu_fdt_setprop_sized_cells(sms->fdt, its_nodename, "reg",
2, sbsa_ref_memmap[SBSA_GIC_ITS].base,
2, sbsa_ref_memmap[SBSA_GIC_ITS].size);
-
- g_free(nodename);
}
/*
--
2.34.1
- [PULL 04/25] target/arm: Pass env pointer through to gvec_bfdot_idx helper, (continued)
- [PULL 04/25] target/arm: Pass env pointer through to gvec_bfdot_idx helper, Peter Maydell, 2024/09/05
- [PULL 16/25] hw/nvram/xlnx-bbram: Call register_finalize_block, Peter Maydell, 2024/09/05
- [PULL 17/25] hw/nvram/xlnx-zynqmp-efuse: Call register_finalize_block, Peter Maydell, 2024/09/05
- [PULL 23/25] hw/arm/boot: Report error msg if loading elf/dtb failed, Peter Maydell, 2024/09/05
- [PULL 08/25] target/arm: Enable FEAT_EBF16 in the "max" CPU, Peter Maydell, 2024/09/05
- [PULL 02/25] target/arm: Pass env pointer through to sme_bfmopa helper, Peter Maydell, 2024/09/05
- [PULL 19/25] hm/nvram/xlnx-versal-efuse-ctrl: Call register_finalize_block, Peter Maydell, 2024/09/05
- [PULL 22/25] hw/arm/xilinx_zynq: Enable Security Extensions, Peter Maydell, 2024/09/05
- [PULL 25/25] platform-bus: fix refcount leak, Peter Maydell, 2024/09/05
- [PULL 18/25] hw/misc/xlnx-versal-trng: Call register_finalize_block, Peter Maydell, 2024/09/05
- [PULL 20/25] hw/arm/sbsa-ref: Don't leak string in sbsa_fdt_add_gic_node(),
Peter Maydell <=
- [PULL 21/25] target/arm: Correct names of VFP VFNMA and VFNMS insns, Peter Maydell, 2024/09/05
- [PULL 15/25] hw/misc/xlnx-versal-trng: Free s->prng in finalize, not unrealize, Peter Maydell, 2024/09/05
- [PULL 24/25] hw/arm/boot: Explain why load_elf_hdr() error is ignored, Peter Maydell, 2024/09/05
- Re: [PULL 00/25] target-arm queue, Peter Maydell, 2024/09/06