From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: Mark Rutland <mark.rutland@arm.com>,
qemu-arm@nongnu.org,
Richard Henderson <richard.henderson@linaro.org>
Subject: Re: [Qemu-devel] [PATCH v2 2/4] hw/arm/boot: Diagnose layouts that put initrd or DTB off the end of RAM
Date: Thu, 13 Jun 2019 13:47:59 +0100 [thread overview]
Message-ID: <87imt9ejnk.fsf@zen.linaroharston> (raw)
In-Reply-To: <20190516144733.32399-3-peter.maydell@linaro.org>
Peter Maydell <peter.maydell@linaro.org> writes:
> We calculate the locations in memory where we want to put the
> initrd and the DTB based on the size of the kernel, since they
> come after it. Add some explicit checks that these aren't off the
> end of RAM entirely.
>
> (At the moment the way we calculate the initrd_start means that
> it can't ever be off the end of RAM, but that will change with
> the next commit.)
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> hw/arm/boot.c | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 0bb9a7d5b5c..935be3b92a5 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -1055,11 +1055,25 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,
> error_report("could not load kernel '%s'", info->kernel_filename);
> exit(1);
> }
> +
> + if (kernel_size > info->ram_size) {
> + error_report("kernel '%s' is too large to fit in RAM "
> + "(kernel size %d, RAM size %" PRId64 ")",
> + info->kernel_filename, kernel_size, info->ram_size);
> + exit(1);
> + }
> +
> info->entry = entry;
> if (is_linux) {
> uint32_t fixupcontext[FIXUP_MAX];
>
> if (info->initrd_filename) {
> +
> + if (info->initrd_start >= ram_end) {
> + error_report("not enough space after kernel to load initrd");
> + exit(1);
> + }
> +
> initrd_size = load_ramdisk_as(info->initrd_filename,
> info->initrd_start,
> ram_end - info->initrd_start, as);
> @@ -1075,6 +1089,11 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,
> info->initrd_filename);
> exit(1);
> }
> + if (info->initrd_start + initrd_size > info->ram_size) {
> + error_report("could not load initrd '%s': "
> + "too big to fit into RAM after the kernel",
> + info->initrd_filename);
> + }
> } else {
> initrd_size = 0;
> }
> @@ -1110,6 +1129,10 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,
> /* Place the DTB after the initrd in memory with alignment. */
> info->dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size,
> align);
> + if (info->dtb_start >= ram_end) {
> + error_report("Not enough space for DTB after kernel/initrd");
> + exit(1);
> + }
> fixupcontext[FIXUP_ARGPTR_LO] = info->dtb_start;
> fixupcontext[FIXUP_ARGPTR_HI] = info->dtb_start >> 32;
> } else {
--
Alex Bennée
next prev parent reply other threads:[~2019-06-13 14:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 14:47 [Qemu-devel] [PATCH v2 0/4] hw/arm/boot: handle large Images more gracefully Peter Maydell
2019-05-16 14:47 ` [Qemu-devel] [PATCH v2 1/4] hw/arm/boot: Don't assume RAM starts at address zero Peter Maydell
2019-06-13 12:44 ` Alex Bennée
2019-05-16 14:47 ` [Qemu-devel] [PATCH v2 2/4] hw/arm/boot: Diagnose layouts that put initrd or DTB off the end of RAM Peter Maydell
2019-06-13 12:47 ` Alex Bennée [this message]
2019-05-16 14:47 ` [Qemu-devel] [PATCH v2 3/4] hw/arm/boot: Avoid placing the initrd on top of the kernel Peter Maydell
2019-06-13 12:53 ` [Qemu-devel] [Qemu-arm] " Alex Bennée
2019-07-19 16:47 ` [Qemu-devel] " Mark Rutland
2019-07-22 11:59 ` Peter Maydell
2019-07-22 12:56 ` Mark Rutland
2019-05-16 14:47 ` [Qemu-devel] [PATCH v2 4/4] hw/arm/boot: Honour image size field in AArch64 Image format kernels Peter Maydell
2019-06-13 12:55 ` Alex Bennée
2019-06-07 13:07 ` [Qemu-devel] [PATCH v2 0/4] hw/arm/boot: handle large Images more gracefully Peter Maydell
2019-06-07 14:12 ` Philippe Mathieu-Daudé
2019-06-07 14:07 ` Mark Rutland
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=87imt9ejnk.fsf@zen.linaroharston \
--to=alex.bennee@linaro.org \
--cc=mark.rutland@arm.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).