From: Christian Borntraeger <borntraeger@de.ibm.com>
To: agraf@suse.de
Cc: qemu-devel@nongnu.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH] Fix size checking in load_image_targphys to accept max_size > INT_MAX
Date: Thu, 3 May 2012 16:27:57 +0200 [thread overview]
Message-ID: <1336055277-53204-1-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <4EC02384-64EF-4514-975C-A3D229B3693E@suse.de>
commit 17df768c1e4580f03301d18ea938d3557d441911
load_image_targphys() should enforce the max size
caused some problems with external kernel and specific ram sizes on s390:
We load the external kernel with
[...]
kernel_size = load_image_targphys(kernel_filename, 0, ram_size);
[...]
Since load_image_targphys is declared as taking an int for max_sz, this will
fail for ram sizes > INT_MAX.
Lets change the max_sz parameter to a uint64_t.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
hw/loader.c | 2 +-
hw/loader.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/loader.c b/hw/loader.c
index 415cdce..7d64113 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -103,7 +103,7 @@ ssize_t read_targphys(const char *name,
/* return the size or -1 if error */
int load_image_targphys(const char *filename,
- target_phys_addr_t addr, int max_sz)
+ target_phys_addr_t addr, uint64_t max_sz)
{
int size;
diff --git a/hw/loader.h b/hw/loader.h
index fbcaba9..5cfa6df 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -4,7 +4,7 @@
/* loader.c */
int get_image_size(const char *filename);
int load_image(const char *filename, uint8_t *addr); /* deprecated */
-int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz);
+int load_image_targphys(const char *filename, target_phys_addr_t, uint64_t);
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
uint64_t *highaddr, int big_endian, int elf_machine,
--
1.7.9.6
next prev parent reply other threads:[~2012-05-03 14:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 13:36 [Qemu-devel] S390: file size checking in load_image_targphys and certain ram sizes Christian Borntraeger
2012-05-03 13:51 ` Alexander Graf
2012-05-03 14:27 ` Christian Borntraeger [this message]
2012-05-03 14:33 ` [Qemu-devel] [PATCH] Fix size checking in load_image_targphys to accept max_size > INT_MAX Peter Maydell
2012-05-04 14:05 ` Christian Borntraeger
2012-05-09 10:42 ` Christian Borntraeger
2012-05-16 10:29 ` Christian Borntraeger
2012-05-18 0:18 ` Alexander Graf
2012-05-18 0:26 ` Anthony Liguori
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=1336055277-53204-1-git-send-email-borntraeger@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=agraf@suse.de \
--cc=peter.maydell@linaro.org \
--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).