From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>,
Steffen Trumtrar <s.trumtrar@pengutronix.de>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 19/21] fit: add fuzz test
Date: Thu, 5 Jun 2025 13:35:28 +0200 [thread overview]
Message-ID: <20250605113530.2076990-20-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250605113530.2076990-1-a.fatoum@pengutronix.de>
We require FIT images on non-EFI systems to implement verified boot
chains. Unfortunately, FIT is a relatively complex format for that use
case, so a fuzz test exercising the parser is pretty much in order.
Co-developed-by: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>
Signed-off-by: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>
Co-developed-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
common/image-fit.c | 76 +++++++++++++++++++++++++++++++++++++++--
images/Makefile.sandbox | 1 +
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/common/image-fit.c b/common/image-fit.c
index 0cc0425284c5..5006394eb7bb 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -23,6 +23,7 @@
#include <crypto/public_key.h>
#include <uncompress.h>
#include <image-fit.h>
+#include <fuzz.h>
#define FDT_MAX_DEPTH 32
#define FDT_MAX_PATH_LEN 200
@@ -825,6 +826,26 @@ static int fit_find_compatible_unit(struct fit_handle *handle,
return -ENOENT;
}
+static int fit_find_last_unit(struct fit_handle *handle,
+ const char **out_unit)
+{
+ struct device_node *conf_node = handle->configurations;
+ struct device_node *child;
+ const char *unit = NULL;
+
+ if (!conf_node)
+ return 0;
+
+ for_each_child_of_node(conf_node, child)
+ unit = child->name;
+
+ if (!unit)
+ return -ENOENT;
+
+ *out_unit = unit;
+ return 0;
+}
+
/**
* fit_open_configuration - open a FIT configuration
* @handle: The FIT image handle
@@ -970,12 +991,16 @@ struct fit_handle *fit_open(const char *filename, bool verbose,
return handle;
}
-void fit_close(struct fit_handle *handle)
+static void __fit_close(struct fit_handle *handle)
{
if (handle->root)
of_delete_node(handle->root);
-
free(handle->fit_alloc);
+}
+
+void fit_close(struct fit_handle *handle)
+{
+ __fit_close(handle);
free(handle);
}
@@ -997,3 +1022,50 @@ static int bootm_fit_register(void)
return register_image_handler(&fit_handler);
}
late_initcall(bootm_fit_register);
+
+static int fuzz_fit(const u8 *data, size_t size)
+{
+ const char *unit, *imgname = "kernel";
+ struct fit_handle handle = {};
+ const void *outdata;
+ unsigned long outsize, addr;
+ int ret;
+ void *config;
+
+ handle.verbose = false;
+ handle.verify = BOOTM_VERIFY_AVAILABLE;
+
+ handle.size = size;
+ handle.fit = data;
+ handle.fit_alloc = NULL;
+
+ ret = fit_do_open(&handle);
+ if (ret)
+ goto out;
+
+ config = fit_open_configuration(&handle, NULL);
+ if (IS_ERR(config)) {
+ ret = fit_find_last_unit(&handle, &unit);
+ if (ret)
+ goto out;
+ config = fit_open_configuration(&handle, unit);
+ }
+ if (IS_ERR(config)) {
+ ret = PTR_ERR(config);
+ goto out;
+ }
+
+ ret = fit_open_image(&handle, config, imgname, &outdata, &outsize);
+ if (ret)
+ goto out;
+
+ fit_get_image_address(&handle, config, imgname, "load", &addr);
+ fit_get_image_address(&handle, config, imgname, "entry", &addr);
+
+ ret = fit_open_image(&handle, NULL, imgname, &outdata, &outsize);
+out:
+ __fit_close(&handle);
+
+ return 0;
+}
+fuzz_test("fit", fuzz_fit);
diff --git a/images/Makefile.sandbox b/images/Makefile.sandbox
index 87963e2f432f..b235a1195a7f 100644
--- a/images/Makefile.sandbox
+++ b/images/Makefile.sandbox
@@ -4,6 +4,7 @@ SYMLINK_TARGET_barebox = sandbox_main.elf
symlink-$(CONFIG_SANDBOX) += barebox
fuzzer-$(CONFIG_FILETYPE) += filetype
+fuzzer-$(CONFIG_FITIMAGE) += fit
fuzzer-$(CONFIG_OFTREE) += dtb
fuzzer-$(CONFIG_OFTREE) += fdt-compatible
fuzzer-$(CONFIG_PARTITION) += partitions
--
2.39.5
next prev parent reply other threads:[~2025-06-05 11:39 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-05 11:35 [PATCH 00/21] sandbox: add libfuzzer-based fuzzing Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 01/21] pbl: add provision for architectures without piggy loader Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 02/21] firmware: make Layerscape FMan firmware proper-only Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 03/21] mci: sdhci: support compiling common SDHCI code for sandbox PBL Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 04/21] kbuild: define and use more generic symlink command Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 05/21] kbuild: collect compatibility symlink creation in symlink-y Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 06/21] kbuild: allow customizing barebox proper binary Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 07/21] sandbox: make available all CONFIG_ symbols to OS glue code Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 08/21] sandbox: switch to using PBL Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 09/21] kbuild: populate non-host CXX variables Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 10/21] string: add fortify source support Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 11/21] sandbox: populate UNAME_M variable Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 12/21] Add fuzzing infrastructure Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 13/21] filetype: add fuzz target Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 14/21] block: mark underlying cdev with DEVFS_IS_BLOCK_DEV Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 15/21] block: add lightweight ramdisk support Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 16/21] fuzz: add support for passing fuzz data as r/o ramdisk Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 17/21] partitions: add partition table parser fuzz target Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 18/21] fdt: add fuzz test Ahmad Fatoum
2025-06-05 11:35 ` Ahmad Fatoum [this message]
2025-06-05 11:35 ` [PATCH 20/21] Documentation: add LLVM libfuzzer documentation Ahmad Fatoum
2025-06-05 11:35 ` [PATCH 21/21] sandbox: add support for coverage info generation Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250605113530.2076990-20-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=abdelrahmanyossef12@gmail.com \
--cc=barebox@lists.infradead.org \
--cc=s.trumtrar@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox