david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/boot: fix direct kernel boot with initrd

Browse Source 
Fix the condition used to check whether the initrd fits
into RAM; in some cases if an initrd was also passed on
the command line we would get an error stating that it
was too big to fit into RAM after the kernel. Despite the
error the loader continued anyway, though, so also add an
exit(1) when the initrd is actually too big.

Fixes: 852dc64d665f ("hw/arm/boot: Diagnose layouts that put initrd or
DTB off the end of RAM")
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190618125844.4863-1-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrew Jones 2019-07-01 17:26:14 +01:00 committed by Peter Maydell
parent ae9108f8f0
commit b48b064009
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/arm/boot.c
View File

@ -1109,10 +1109,11 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,
info->initrd_filename); info->initrd_filename);
exit(1); exit(1);
} }
if (info->initrd_start + initrd_size > info->ram_size) { if (info->initrd_start + initrd_size > ram_end) {
error_report("could not load initrd '%s': " error_report("could not load initrd '%s': "
"too big to fit into RAM after the kernel", "too big to fit into RAM after the kernel",
info->initrd_filename); info->initrd_filename);
exit(1);
} }
} else { } else {
initrd_size = 0; initrd_size = 0;