mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 05:38:00 +00:00
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>
This commit is contained in:
parent
1291a682f8
commit
68cd4dc3ed
@ -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,
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user