mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-26 04:13:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

uImage: don't leak file data or file descriptor (Hollis Blanchard)

Browse Source 
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5761 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-11-20 22:02:56 +00:00
parent 3adae656c7
commit 265ca29a71
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
loader.c
View File

@ -354,6 +354,7 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
uboot_image_header_t h; uboot_image_header_t h;
uboot_image_header_t *hdr = &h; uboot_image_header_t *hdr = &h;
uint8_t *data = NULL; uint8_t *data = NULL;
int ret = -1;
fd = open(filename, O_RDONLY | O_BINARY); fd = open(filename, O_RDONLY | O_BINARY);
if (fd < 0) if (fd < 0)
@ -361,23 +362,23 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
size = read(fd, hdr, sizeof(uboot_image_header_t)); size = read(fd, hdr, sizeof(uboot_image_header_t));
if (size < 0) if (size < 0)
goto fail; goto out;
bswap_uboot_header(hdr); bswap_uboot_header(hdr);
if (hdr->ih_magic != IH_MAGIC) if (hdr->ih_magic != IH_MAGIC)
goto fail; goto out;
/* TODO: Implement Multi-File images. */ /* TODO: Implement Multi-File images. */
if (hdr->ih_type == IH_TYPE_MULTI) { if (hdr->ih_type == IH_TYPE_MULTI) {
fprintf(stderr, "Unable to load multi-file u-boot images\n"); fprintf(stderr, "Unable to load multi-file u-boot images\n");
goto fail; goto out;
} }
/* TODO: Implement compressed images. */ /* TODO: Implement compressed images. */
if (hdr->ih_comp != IH_COMP_NONE) { if (hdr->ih_comp != IH_COMP_NONE) {
fprintf(stderr, "Unable to load compressed u-boot images\n"); fprintf(stderr, "Unable to load compressed u-boot images\n");
goto fail; goto out;
} }
/* TODO: Check CPU type. */ /* TODO: Check CPU type. */
@ -391,20 +392,20 @@ int load_uboot(const char *filename, target_ulong *ep, int *is_linux)
*ep = hdr->ih_ep; *ep = hdr->ih_ep;
data = qemu_malloc(hdr->ih_size); data = qemu_malloc(hdr->ih_size);
if (!data) if (!data)
goto fail; goto out;
if (read(fd, data, hdr->ih_size) != hdr->ih_size) { if (read(fd, data, hdr->ih_size) != hdr->ih_size) {
fprintf(stderr, "Error reading file\n"); fprintf(stderr, "Error reading file\n");
goto fail; goto out;
} }
cpu_physical_memory_write_rom(hdr->ih_load, data, hdr->ih_size); cpu_physical_memory_write_rom(hdr->ih_load, data, hdr->ih_size);
return hdr->ih_size; ret = hdr->ih_size;
fail: out:
if (data) if (data)
qemu_free(data); qemu_free(data);
close(fd); close(fd);
return -1; return ret;
} }