diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-08-12 12:02:04 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-08-12 12:02:41 +0200 |
| commit | 68cd4dc3ed6e50988bcc4f1eaeec9902677f109b (patch) | |
| tree | 5f0f1b303f2c5505a204eac024a94235593e497d | |
| parent | 1291a682f855f6d8814134771f9923f4f80b524f (diff) | |
| download | upstream-68cd4dc3ed6e50988bcc4f1eaeec9902677f109b.tar.gz upstream-68cd4dc3ed6e50988bcc4f1eaeec9902677f109b.tar.bz2 upstream-68cd4dc3ed6e50988bcc4f1eaeec9902677f109b.zip | |
mkimage: fix validation of legacy images with custom magic
All images generated by mkimage are now always validated.
This change broke our downstream support for setting a custom value for
IH_MAGIC (mkimage -M ...). Make sure also plain legacy kernel images
with custom value set for IH_MAGIC validate correctly.
Fixes: fa9895ee5b ("tools: mkimage: update to U-Boot release 2022.07")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch index 017f0b9b34..b97cd819cc 100644 --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch @@ -50,6 +50,15 @@ This patch makes it possible to set a custom image magic. break; --- a/tools/default_image.c +++ b/tools/default_image.c +@@ -56,7 +56,7 @@ static int image_verify_header(unsigned + */ + memcpy(hdr, ptr, sizeof(image_header_t)); + +- if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) { ++ if (be32_to_cpu(hdr->ih_magic) != params->magic) { + debug("%s: Bad Magic Number: \"%s\" is no valid image\n", + params->cmdname, params->imagefile); + return -FDT_ERR_BADMAGIC; @@ -120,7 +120,7 @@ static void image_set_header(void *ptr, } |