openwrt-mirror/openwrt
1
0 Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-10-12 06:57:57 +04:00
Code Issues Packages Projects Releases Wiki Activity

tools/mkimage: support custom magic in dumpimage

Browse Source 
OpenWrt's custom uImage magic patch makes legacy image verification use
params.magic instead of IH_MAGIC.

mkimage initializes this field, while dumpimage leaves it zeroed. This
causes dumpimage to reject valid legacy uImages using the standard
IH_MAGIC with FDT_ERR_BADMAGIC.

Initialize dumpimage's magic to IH_MAGIC so the normal verification path
works by default. Also add -M handling matching mkimage, allowing
dumpimage to verify and extract uImages built with a custom magic.

Tested with the patched U-Boot 2026.07 host tools. Standard-magic images
list and extract correctly, custom-magic images are accepted with the
matching -M value, and are rejected without it or with an incorrect
magic. Extracted payloads were verified byte-for-byte.

Fixes: #25287
Signed-off-by: Massimo Mazzariol <mazzariol.massimo@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/25288
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Massimo Mazzariol authored and Robert Marko committed 2026-09-25 10:05:04 +02:00
1 parent a3676bf9ca
commit f9a75af743
1 file changed
+66
Download Patch File Download Diff File Expand all files Collapse all files
tools/mkimage/patches/030-allow-to-use-different-magic.patch
+66
View File
@@ -5,6 +5,72 @@ Subject: [PATCH] tools/mkimage: allow to use different magic in uImages
This patch makes it possible to set a custom image magic.
--- a/tools/dumpimage.c
+++ b/tools/dumpimage.c
@@ -7,12 +7,15 @@
#include "dumpimage.h"
#include <image.h>
+#include <stdint.h>
#include <version.h>
static void usage(void);
/* parameters initialized by core will be used by the image type code */
-static struct image_tool_params params;
+static struct image_tool_params params = {
+ .magic = IH_MAGIC,
+};
/*
* dumpimage_extract_subimage -
@@ -67,16 +70,26 @@ int main(int argc, char **argv)
int ifd = -1;
struct stat sbuf;
char *ptr;
+ unsigned long long magic;
int retval = EXIT_SUCCESS;
struct image_type_params *tparams = NULL;
params.cmdname = *argv;
- while ((opt = getopt(argc, argv, "hlo:T:p:V")) != -1) {
+ while ((opt = getopt(argc, argv, "hlM:o:T:p:V")) != -1) {
switch (opt) {
case 'l':
params.lflag = 1;
break;
+ case 'M':
+ magic = strtoull(optarg, &ptr, 16);
+ if (*ptr || magic > UINT32_MAX) {
+ fprintf(stderr, "%s: invalid magic %s\n",
+ params.cmdname, optarg);
+ exit(EXIT_FAILURE);
+ }
+ params.magic = magic;
+ break;
case 'o':
params.outfile = optarg;
params.iflag = 1;
@@ -201,13 +214,15 @@ int main(int argc, char **argv)
static void usage(void)
{
- fprintf(stderr, "Usage: %s [-T type] -l image\n"
+ fprintf(stderr, "Usage: %s [-T type] [-M magic] -l image\n"
" -l ==> list image header information\n"
- " -T ==> parse image file as 'type'\n",
+ " -T ==> parse image file as 'type'\n"
+ " -M ==> set expected image magic to 'magic'\n",
params.cmdname);
fprintf(stderr,
- " %s [-T type] [-p position] [-o outfile] image\n"
+ " %s [-T type] [-M magic] [-p position] [-o outfile] image\n"
" -T ==> declare image type as 'type'\n"
+ " -M ==> set expected image magic to 'magic'\n"
" -p ==> 'position' (starting at 0) of the component to extract from image\n"
" -o ==> extract component to file 'outfile'\n",
params.cmdname);
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -26,6 +26,7 @@ static struct image_tool_params params =