[PATCH] image: android: Automatically detect more compression types

[PATCH] image: android: Automatically detect more compression types

[Stephan Gerhold]

At the moment android_image_get_kcomp() can automatically detect
LZ4 compressed kernels and the compression specified in uImages.
However, especially on ARM64 Linux is often compressed with GZIP.
Attempting to boot an Android image with a GZIP compressed kernel
image currently results in a very strange crash, e.g.

  Starting kernel ...
  "Synchronous Abort" handler, esr 0x02000000
   ...
  Code: 5555d555 55555d55 555f5555 5d555d55 (00088b1f)

Note the 1f8b, which are the "magic" bytes for GZIP images.

U-Boot already has the image_decomp_type() function that checks for
the magic bytes of bzip2, gzip, lzma and lzo. It's easy to make use
of it here to increase the chance that we do the right thing and the
user does not become confused with strange crashes.

This allows booting Android boot images that contain GZIP-compressed
kernel images.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---

 common/image-android.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/image-android.c b/common/image-android.c
index d07b0e0f09..1fbbbba1eb 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -164,7 +164,7 @@ ulong android_image_get_kcomp(const struct andr_img_hdr *hdr)
 	else if (get_unaligned_le32(p) == LZ4F_MAGIC)
 		return IH_COMP_LZ4;
 	else
-		return IH_COMP_NONE;
+		return image_decomp_type(p, sizeof(u32));
 }
 
 int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
-- 
2.32.0

Re: [PATCH] image: android: Automatically detect more compression types

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

On Thu, Jul 01, 2021 at 08:33:16PM +0200, Stephan Gerhold wrote:

> At the moment android_image_get_kcomp() can automatically detect
> LZ4 compressed kernels and the compression specified in uImages.
> However, especially on ARM64 Linux is often compressed with GZIP.
> Attempting to boot an Android image with a GZIP compressed kernel
> image currently results in a very strange crash, e.g.
> 
>   Starting kernel ...
>   "Synchronous Abort" handler, esr 0x02000000
>    ...
>   Code: 5555d555 55555d55 555f5555 5d555d55 (00088b1f)
> 
> Note the 1f8b, which are the "magic" bytes for GZIP images.
> 
> U-Boot already has the image_decomp_type() function that checks for
> the magic bytes of bzip2, gzip, lzma and lzo. It's easy to make use
> of it here to increase the chance that we do the right thing and the
> user does not become confused with strange crashes.
> 
> This allows booting Android boot images that contain GZIP-compressed
> kernel images.
> 
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]