From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQkQs-0001js-QM for qemu-devel@nongnu.org; Wed, 16 Nov 2011 13:42:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQkQp-0002MR-UO for qemu-devel@nongnu.org; Wed, 16 Nov 2011 13:42:02 -0500 Received: from oxygen.pond.sub.org ([78.46.104.156]:52224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQkQp-0002MA-Ps for qemu-devel@nongnu.org; Wed, 16 Nov 2011 13:41:59 -0500 From: Markus Armbruster Date: Wed, 16 Nov 2011 19:41:56 +0100 Message-Id: <1321468916-21589-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] loader: Fix read_targphys() to behave when read() fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com Happily passes (size_t)-1 to rom_add_blob_fixed(), which promptly dies attempting to malloc that much. Spotted by Coverity. Bonus fix for ROMs larger than INT_MAX bytes: return ssize_t instead of int. Bug can't bite, because the only user load_aout() limits ROM size to an int value. Signed-off-by: Markus Armbruster --- hw/loader.c | 9 +++++---- hw/loader.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 5676c18..9bbcddd 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -85,11 +85,11 @@ int load_image(const char *filename, uint8_t *addr) } /* read()-like version */ -int read_targphys(const char *name, - int fd, target_phys_addr_t dst_addr, size_t nbytes) +ssize_t read_targphys(const char *name, + int fd, target_phys_addr_t dst_addr, size_t nbytes) { uint8_t *buf; - size_t did; + ssize_t did; buf = g_malloc(nbytes); did = read(fd, buf, nbytes); @@ -176,7 +176,8 @@ static void bswap_ahdr(struct exec *e) int load_aout(const char *filename, target_phys_addr_t addr, int max_sz, int bswap_needed, target_phys_addr_t target_page_size) { - int fd, size, ret; + int fd; + ssize_t size, ret; struct exec e; uint32_t magic; diff --git a/hw/loader.h b/hw/loader.h index fc6bdff..fbcaba9 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -14,8 +14,8 @@ int load_aout(const char *filename, target_phys_addr_t addr, int max_sz, int load_uimage(const char *filename, target_phys_addr_t *ep, target_phys_addr_t *loadaddr, int *is_linux); -int read_targphys(const char *name, - int fd, target_phys_addr_t dst_addr, size_t nbytes); +ssize_t read_targphys(const char *name, + int fd, target_phys_addr_t dst_addr, size_t nbytes); void pstrcpy_targphys(const char *name, target_phys_addr_t dest, int buf_size, const char *source); -- 1.7.6.4