[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/77] hw/core/loader.c: Read as long as possible in
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 37/77] hw/core/loader.c: Read as long as possible in load_image_size() |
Date: |
Mon, 4 Feb 2019 19:35:39 +0100 |
From: Li Zhijian <address@hidden>
Don't expect read(2) can always read as many as it's told.
CC: Richard Henderson <address@hidden>
CC: Stefano Garzarella <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/loader.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 3a000d5..fe5cb24 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -77,21 +77,20 @@ int64_t get_image_size(const char *filename)
ssize_t load_image_size(const char *filename, void *addr, size_t size)
{
int fd;
- ssize_t actsize;
+ ssize_t actsize, l = 0;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd < 0) {
return -1;
}
- actsize = read(fd, addr, size);
- if (actsize < 0) {
- close(fd);
- return -1;
+ while ((actsize = read(fd, addr + l, size - l)) > 0) {
+ l += actsize;
}
+
close(fd);
- return actsize;
+ return actsize < 0 ? -1 : l;
}
/* read()-like version */
--
1.8.3.1
- [Qemu-devel] [PULL 12/77] elf: Add optional function ptr to load_elf() to parse ELF notes, (continued)
- [Qemu-devel] [PULL 12/77] elf: Add optional function ptr to load_elf() to parse ELF notes, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 24/77] i386: remove the 'INTEL_PT' CPUID bit from named CPU models, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 26/77] target-i386: hvf: remove MPX support, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 22/77] hw/i386/pc: enable PVH only for machine type >= 4.0, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 28/77] contrib/elf2dmp: use GLib in ELF processing, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 19/77] optionrom: add new PVH option rom, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 21/77] optionrom/pvh: load initrd from fw_cfg, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 25/77] Revert "i386: Add CPUID bit for PCONFIG", Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 27/77] contrib/elf2dmp: fix elf.h including, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 15/77] pvh: Boot uncompressed kernel using direct boot ABI, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 37/77] hw/core/loader.c: Read as long as possible in load_image_size(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 40/77] docker: adjust Xen repository for CentOS 7, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 33/77] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 38/77] i386: import & use bootparam.h, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 36/77] unify len and addr type for memory/address APIs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 34/77] crypto: finish removing TABs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 39/77] i386: allow to load initrd below 4 GB for recent linux, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 35/77] ui: vnc: finish removing TABs, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 41/77] i386: hvf: Don't miss 16-bit displacement, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 43/77] scsi-generic: avoid possible out-of-bounds access to r->buf, Paolo Bonzini, 2019/02/04
- [Qemu-devel] [PULL 42/77] gdbstub: Fix i386/x86_64 machine description and add control registers, Paolo Bonzini, 2019/02/04