diff options
author | Gonglei | 2014-11-15 11:06:43 +0100 |
---|---|---|
committer | Paolo Bonzini | 2014-11-17 11:41:56 +0100 |
commit | ddd2eab72fbd383a56f439bf278c6d647abd4f54 (patch) | |
tree | 210dc126a5658871b2378becc740365ef0fb8644 /hw/core/loader.c | |
parent | qga: fix false negative argument passing (diff) | |
download | qemu-ddd2eab72fbd383a56f439bf278c6d647abd4f54.tar.gz qemu-ddd2eab72fbd383a56f439bf278c6d647abd4f54.tar.xz qemu-ddd2eab72fbd383a56f439bf278c6d647abd4f54.zip |
loader: fix NEGATIVE_RETURNS
lseek will return -1 on error, g_malloc0(size) and read(,,size)
paramenters cannot be negative. We should add a check for return
value of lseek().
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core/loader.c')
-rw-r--r-- | hw/core/loader.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index bbe6eb3d82..fc155359f8 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -80,6 +80,13 @@ int load_image(const char *filename, uint8_t *addr) if (fd < 0) return -1; size = lseek(fd, 0, SEEK_END); + if (size == -1) { + fprintf(stderr, "file %-20s: get size error: %s\n", + filename, strerror(errno)); + close(fd); + return -1; + } + lseek(fd, 0, SEEK_SET); if (read(fd, addr, size) != size) { close(fd); @@ -748,6 +755,12 @@ int rom_add_file(const char *file, const char *fw_dir, } rom->addr = addr; rom->romsize = lseek(fd, 0, SEEK_END); + if (rom->romsize == -1) { + fprintf(stderr, "rom: file %-20s: get size error: %s\n", + rom->name, strerror(errno)); + goto err; + } + rom->datasize = rom->romsize; rom->data = g_malloc0(rom->datasize); lseek(fd, 0, SEEK_SET); |