mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed: Fix a potential memory leak bug in write_boot_rom()

Browse Source 
A memory chunk is allocated with g_new0() and assigned to the variable
'storage'. However, if the branch takes true, there will be only an
error report but not a free operation for 'storage' before function
returns. As a result, a memory leak bug is triggered.

Use g_autofree to fix the issue.

Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Wentao_Liang <Wentao_Liang_g@163.com>
[ clg: reworked the commit log ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Wentao_Liang 2022-03-08 09:18:11 +01:00 committed by Cédric Le Goater
parent b49872aa8f
commit 05e6e40a86
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/aspeed.c
View File

@ -246,7 +246,7 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size,
Error **errp) Error **errp)
{ {
BlockBackend *blk = blk_by_legacy_dinfo(dinfo); BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
uint8_t *storage; g_autofree void *storage = NULL;
int64_t size; int64_t size;
/* The block backend size should have already been 'validated' by /* The block backend size should have already been 'validated' by
@ -262,14 +262,13 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size,
rom_size = size; rom_size = size;
} }
storage = g_new0(uint8_t, rom_size); storage = g_malloc0(rom_size);
if (blk_pread(blk, 0, storage, rom_size) < 0) { if (blk_pread(blk, 0, storage, rom_size) < 0) {
error_setg(errp, "failed to read the initial flash content"); error_setg(errp, "failed to read the initial flash content");
return; return;
} }
rom_add_blob_fixed("aspeed.boot_rom", storage, rom_size, addr); rom_add_blob_fixed("aspeed.boot_rom", storage, rom_size, addr);
g_free(storage);
} }
static void aspeed_board_init_flashes(AspeedSMCState *s, static void aspeed_board_init_flashes(AspeedSMCState *s,