[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] loader: fix NEGATIVE_RETURNS
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/12] loader: fix NEGATIVE_RETURNS |
Date: |
Mon, 17 Nov 2014 18:08:13 +0100 |
From: Gonglei <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/loader.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index bbe6eb3..fc15535 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);
--
1.8.3.1
- [Qemu-devel] [PULL 00/12] Coverity fixes for 2.2.0-rc2, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 01/12] libcacard: fix resource leak, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 02/12] l2tpv3: fix possible double free, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 03/12] l2tpv3: fix fd leak, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 04/12] mips_mipssim: fix use-after-free for filename, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 06/12] loader: fix NEGATIVE_RETURNS,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/12] qga: fix false negative argument passing, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 07/12] nvme: remove superfluous check, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 08/12] acl: fix memory leak, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 09/12] qemu-char: fix MISSING_COMMA, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 10/12] shpc: fix error propaagation, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 11/12] target-cris/translate.c: fix out of bounds read, Paolo Bonzini, 2014/11/17
- [Qemu-devel] [PULL 12/12] hcd-musb: fix dereference null return value, Paolo Bonzini, 2014/11/17
- Re: [Qemu-devel] [PULL 00/12] Coverity fixes for 2.2.0-rc2, Peter Maydell, 2014/11/17