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: validate custom magic range

Browse Source 
strtoull() can parse values wider than the 32-bit uImage magic field.
Reject values above UINT32_MAX before assigning the parsed value to
params.magic.

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 f9a75af743
commit 36efe835fd
1 file changed
+24 -7
Download Patch File Download Diff File Expand all files Collapse all files
tools/mkimage/patches/030-allow-to-use-different-magic.patch
+24 -7
View File
@@ -73,7 +73,15 @@ This patch makes it possible to set a custom image magic.
params.cmdname);
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -26,6 +26,7 @@ static struct image_tool_params params =
@@ -13,6 +13,7 @@
#include <fit_common.h>
#include <getopt.h>
#include <image.h>
+#include <stdint.h>
#include <version.h>
#ifdef __linux__
#include <sys/ioctl.h>
@@ -26,6 +27,7 @@ static struct image_tool_params params = {
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
@@ -81,7 +89,7 @@ This patch makes it possible to set a custom image magic.
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
.imagename2 = "",
@@ -89,11 +90,12 @@ static void usage(const char *msg)
@@ -89,11 +91,12 @@ static void usage(const char *msg)
" -q ==> quiet\n",
params.cmdname);
fprintf(stderr,
@@ -95,7 +103,7 @@ This patch makes it possible to set a custom image magic.
" -a ==> set load address to 'addr' (hex)\n"
" -e ==> set entry point to 'ep' (hex)\n"
" -n ==> set image name to 'name'\n"
@@ -164,7 +166,7 @@ static int add_content(int type, const c
@@ -164,7 +167,7 @@ static int add_content(int type, const char *fname)
}
static const char optstring[] =
@@ -104,17 +112,26 @@ This patch makes it possible to set a custom image magic.
static const struct option longopts[] = {
{ "load-address", required_argument, NULL, 'a' },
@@ -312,6 +314,14 @@ static void process_args(int argc, char
@@ -210,6 +213,7 @@ static const struct option longopts[] = {
static void process_args(int argc, char **argv)
{
char *ptr;
+ unsigned long long magic;
int type = IH_TYPE_INVALID;
char *datafile = NULL;
int opt;
@@ -312,6 +316,15 @@ static void process_args(int argc, char **argv)
case 'l':
params.lflag = 1;
break;
+ case 'M':
+ params.magic = strtoull(optarg, &ptr, 16);
+ if (*ptr) {
+ fprintf(stderr, "%s: invalid magic %s\n",
+ 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 'n':
params.imagename = optarg;