If we want to assume that the compressed image will expand by a maximum
of 4x, we actually need to reserve 5x the space, since we need to keep
a copy of the compessed image around while decompressing.

Signed-off-by: Russell King <r...@armlinux.org.uk>
---
 kexec/arch/arm/kexec-zImage-arm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kexec/arch/arm/kexec-zImage-arm.c 
b/kexec/arch/arm/kexec-zImage-arm.c
index 297b7fd8..9400d1f4 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -526,8 +526,10 @@ int zImage_arm_load(int argc, char **argv, const char 
*buf, off_t len,
                initrd_base = kernel_base + _ALIGN(kexec_arm_image_size, 
getpagesize());
        } else {
                /* Otherwise, assume the maximum kernel compression ratio
-                * is 4, and just to be safe, place ramdisk after that */
-               initrd_base = kernel_base + _ALIGN(len * 4, getpagesize());
+                * is 4, and just to be safe, place ramdisk after that.
+                * Note that we must include space for the compressed
+                * image here as well. */
+               initrd_base = kernel_base + _ALIGN(len * 5, getpagesize());
        }
 
        if (use_atags) {
-- 
1.9.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Reply via email to