From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gonglei <arei.gonglei@huawei.com>
Subject: [Qemu-devel] [PULL 06/12] loader: fix NEGATIVE_RETURNS
Date: Mon, 17 Nov 2014 18:08:13 +0100 [thread overview]
Message-ID: <1416244099-7217-7-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1416244099-7217-1-git-send-email-pbonzini@redhat.com>
From: Gonglei <arei.gonglei@huawei.com>
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>
---
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
next prev parent reply other threads:[~2014-11-17 17:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 17:08 [Qemu-devel] [PULL 00/12] Coverity fixes for 2.2.0-rc2 Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 01/12] libcacard: fix resource leak Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 02/12] l2tpv3: fix possible double free Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 03/12] l2tpv3: fix fd leak Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 04/12] mips_mipssim: fix use-after-free for filename Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 05/12] qga: fix false negative argument passing Paolo Bonzini
2014-11-17 17:08 ` Paolo Bonzini [this message]
2014-11-17 17:08 ` [Qemu-devel] [PULL 07/12] nvme: remove superfluous check Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 08/12] acl: fix memory leak Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 09/12] qemu-char: fix MISSING_COMMA Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 10/12] shpc: fix error propaagation Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 11/12] target-cris/translate.c: fix out of bounds read Paolo Bonzini
2014-11-17 17:08 ` [Qemu-devel] [PULL 12/12] hcd-musb: fix dereference null return value Paolo Bonzini
2014-11-17 19:29 ` [Qemu-devel] [PULL 00/12] Coverity fixes for 2.2.0-rc2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416244099-7217-7-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).