hw/arm/highbank: Fix resource leak and wrong image loading

Coverity reports a resource leak for sysboot_filename which is allocated
by qemu_find_file.

In addition, that name is used to get the size of the image, but a
different image name was used to load it.

In addition, instead of passing the maximum allowed image size the actual
image size was passed to load_image_targphys.

Fix all three issues.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1426326781-2488-1-git-send-email-sw@weilnetz.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Stefan Weil 2015-04-01 17:57:29 +01:00 committed by Peter Maydell
parent b8a86c4ac4
commit 60ff4e63e2

View File

@ -278,8 +278,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
if (bios_name != NULL) { if (bios_name != NULL) {
sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (sysboot_filename != NULL) { if (sysboot_filename != NULL) {
uint32_t filesize = get_image_size(sysboot_filename); if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) < 0) {
if (load_image_targphys("sysram.bin", 0xfff88000, filesize) < 0) {
hw_error("Unable to load %s\n", bios_name); hw_error("Unable to load %s\n", bios_name);
} }
g_free(sysboot_filename); g_free(sysboot_filename);