haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

riscv/boot: Fix possible memory leak

Browse source 
Coverity (CID 1405786) thinks that there is a possible memory leak as
we don't guarantee that the memory allocated from riscv_find_firmware()
is freed. This is a false positive, but let's tidy up the code to fix
the warning.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Alistair Francis 2019-10-03 09:59:29 -07:00 committed by Palmer Dabbelt
parent 81d2929c41
commit 3aa9004f09
No known key found for this signature in database
GPG key ID: EF4CA1502CCBAB41
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hw/riscv/boot.c
View file

@ -38,7 +38,7 @@ void riscv_find_and_load_firmware(MachineState *machine,
const char *default_machine_firmware, const char *default_machine_firmware,
hwaddr firmware_load_addr) hwaddr firmware_load_addr)
{ {
char *firmware_filename; char *firmware_filename = NULL;
if (!machine->firmware) { if (!machine->firmware) {
/* /*
@ -70,14 +70,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
* if no -bios option is set without breaking anything. * if no -bios option is set without breaking anything.
*/ */
firmware_filename = riscv_find_firmware(default_machine_firmware); firmware_filename = riscv_find_firmware(default_machine_firmware);
} else { } else if (strcmp(machine->firmware, "none")) {
firmware_filename = machine->firmware; firmware_filename = riscv_find_firmware(machine->firmware);
if (strcmp(firmware_filename, "none")) {
firmware_filename = riscv_find_firmware(firmware_filename);
}
} }
if (strcmp(firmware_filename, "none")) { if (firmware_filename) {
/* If not "none" load the firmware */ /* If not "none" load the firmware */
riscv_load_firmware(firmware_filename, firmware_load_addr); riscv_load_firmware(firmware_filename, firmware_load_addr);
g_free(firmware_filename); g_free(firmware_filename);