From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPnA-0003g0-9U for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPn4-00068D-Bi for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:44 -0500 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:48068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPn4-00067q-4c for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:38 -0500 Received: by mail-wi0-f181.google.com with SMTP id r20so3443703wiv.2 for ; Mon, 17 Nov 2014 09:08:37 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Nov 2014 18:08:13 +0100 Message-Id: <1416244099-7217-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> References: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 06/12] loader: fix NEGATIVE_RETURNS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei From: Gonglei 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 Signed-off-by: Paolo Bonzini --- 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