riscv/boot: Fix possible memory leak
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:
parent
81d2929c41
commit
3aa9004f09
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue