ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Gonglei 2014-11-15 18:06:43 +08:00 committed by Paolo Bonzini
parent 1def74548d
commit ddd2eab72f
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/core/loader.c
View File

@ -80,6 +80,13 @@ int load_image(const char *filename, uint8_t *addr)
if (fd < 0) if (fd < 0)
return -1; return -1;
size = lseek(fd, 0, SEEK_END); 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); lseek(fd, 0, SEEK_SET);
if (read(fd, addr, size) != size) { if (read(fd, addr, size) != size) {
close(fd); close(fd);
@ -748,6 +755,12 @@ int rom_add_file(const char *file, const char *fw_dir,
} }
rom->addr = addr; rom->addr = addr;
rom->romsize = lseek(fd, 0, SEEK_END); 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->datasize = rom->romsize;
rom->data = g_malloc0(rom->datasize); rom->data = g_malloc0(rom->datasize);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);