aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Francis <Alistair.Francis@wdc.com>2018-11-05 19:44:41 +0000
committerPalmer Dabbelt <palmer@sifive.com>2018-11-08 08:41:06 -0800
commit00a014ac01feac875468d38c376f7e06f050f992 (patch)
treeae6d523b18ab3e60213af4bbf17c5e6729440c77
parenta7ce790a029bd94eb320d8c69f38900f5233997e (diff)
downloadqemu-00a014ac01feac875468d38c376f7e06f050f992.zip
qemu-00a014ac01feac875468d38c376f7e06f050f992.tar.gz
qemu-00a014ac01feac875468d38c376f7e06f050f992.tar.bz2
riscv: spike: Fix memory leak in the board init
Coverity caught a malloc() call that was never freed. This patch ensures that we free the memory but also updates the allocation to use g_strdup_printf() instead of malloc(). Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Suggested-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Palmer Dabbelt <palmer@sifive.com> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
-rw-r--r--hw/riscv/spike.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 8a712ed..268df04 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -316,9 +316,7 @@ static void spike_v1_09_1_board_init(MachineState *machine)
/* build config string with supplied memory size */
char *isa = riscv_isa_string(&s->soc.harts[0]);
- size_t config_string_size = strlen(config_string_tmpl) + 48;
- char *config_string = malloc(config_string_size);
- snprintf(config_string, config_string_size, config_string_tmpl,
+ char *config_string = g_strdup_printf(config_string_tmpl,
(uint64_t)memmap[SPIKE_CLINT].base + SIFIVE_TIME_BASE,
(uint64_t)memmap[SPIKE_DRAM].base,
(uint64_t)ram_size, isa,
@@ -345,6 +343,8 @@ static void spike_v1_09_1_board_init(MachineState *machine)
/* Core Local Interruptor (timer and IPI) */
sifive_clint_create(memmap[SPIKE_CLINT].base, memmap[SPIKE_CLINT].size,
smp_cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);
+
+ g_free(config_string);
}
static void spike_v1_09_1_machine_init(MachineClass *mc)