Commit 3b4f50bd authored by Peter Maydell's avatar Peter Maydell Committed by David Gibson
Browse files

hw/ppc/e500.c: Handle qemu_find_file() failure 



If qemu_find_file() doesn't find the BIOS it returns NULL; we were
passing that unchecked through to load_elf(), which assumes a non-NULL
pointer and may misbehave. In practice it fails with a weird message:

  $ qemu-system-ppc -M ppce500 -display none -kernel nonesuch
  Bad address
  qemu-system-ppc: could not load firmware '(null)'

Handle the failure case better:

  $ qemu-system-ppc -M ppce500 -display none -kernel nonesuch
  qemu-system-ppc: could not find firmware/kernel file 'nonesuch'

Spotted by Coverity (CID 1238954).

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20200324121216.23899-1-peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 53ef8a92

hw/ppc/e500.c

+4 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,10 @@ void ppce500_init(MachineState *machine) 
    }



    filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, payload_name);

    if (!filename) {

        error_report("could not find firmware/kernel file '%s'", payload_name);

        exit(1);

    }



    payload_size = load_elf(filename, NULL, NULL, NULL,

                            &bios_entry, &loadaddr, NULL, NULL,