smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image: Set load_end on partial loads

Browse Source 
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>
This commit is contained in:
Mattijs Korpershoek
2024-05-23 11:27:09 +02:00
committed by Tom Rini
parent 6068abe33f
commit 3078766134
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/image.c
View File

@@ -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;
}