From 3078766134ae6d9c8746300b084a293105e35f60 Mon Sep 17 00:00:00 2001
From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Date: Thu, 23 May 2024 11:27:09 +0200
Subject: [PATCH] image: Set load_end on partial loads
When decompressing, it's possible that the algorithm only performs
a partial decompression.
This usually happens when CONFIG_SYS_BOOTM_LEN is too small for
the uncompressed image.
When that happens, image_decomp() returns an error and *load_end == load.
The error is then handled by handle_decomp_error().
handle_decomp_error() expects the number of uncompressed bytes in
uncomp_size but receives *load_end - load == load - load == 0.
Because of this, handle_decomp_error does not report the expected
"Image too large: increase CONFIG_SYS_BOOTM_LEN" error message.
Modify the image_decomp() logic to always report the decompressed size,
even when a partial decompression happened.
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
boot/image.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/boot/image.c b/boot/image.c
index bacf5146e1..fc774d605d 100644
--- a/boot/image.c
+++ b/boot/image.c
@@ -528,10 +528,10 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
printf("Unimplemented compression type %d\n", comp);
return ret;
}
- if (ret)
- return ret;
*load_end = load + image_len;
+ if (ret)
+ return ret;
return 0;
}
--
2.39.5