{"id":2223704,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2223704/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/97e38b81f2e8f54ec819940d360849e4cf61b875.1776302806.git.daniel@makrotopia.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.1/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<97e38b81f2e8f54ec819940d360849e4cf61b875.1776302806.git.daniel@makrotopia.org>","date":"2026-04-16T01:47:03","name":"[v2,6/7] test: boot: add runtime unit test for fit_verity_build_cmdline()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9c3c48c193e3e8351523f4f3045f4f2c09b7edf4","submitter":{"id":64091,"url":"http://patchwork.ozlabs.org/api/1.1/people/64091/?format=json","name":"Daniel Golle","email":"daniel@makrotopia.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.1/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/97e38b81f2e8f54ec819940d360849e4cf61b875.1776302806.git.daniel@makrotopia.org/mbox/","series":[{"id":500065,"url":"http://patchwork.ozlabs.org/api/1.1/series/500065/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=500065","date":"2026-04-16T01:46:15","name":"fit: dm-verity support","version":2,"mbox":"http://patchwork.ozlabs.org/series/500065/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223704/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223704/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=makrotopia.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de; dmarc=none (p=none dis=none)\n header.from=makrotopia.org","phobos.denx.de;\n spf=pass smtp.mailfrom=daniel@makrotopia.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fx19c6ztKz1yG9\n\tfor ; Thu, 16 Apr 2026 11:47:48 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id D6E8084253;\n\tThu, 16 Apr 2026 03:47:24 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 8F1D184119; Thu, 16 Apr 2026 03:47:23 +0200 (CEST)","from pidgin.makrotopia.org (pidgin.makrotopia.org\n [IPv6:2a07:2ec0:3002::65])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 3C73384285\n for ; Thu, 16 Apr 2026 03:47:20 +0200 (CEST)","from local\n by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256)\n (Exim 4.99) (envelope-from )\n id 1wDBox-000000006gX-12aW; Thu, 16 Apr 2026 01:47:07 +0000"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-1.9 required=5.0 tests=BAYES_00,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","Date":"Thu, 16 Apr 2026 02:47:03 +0100","From":"Daniel Golle ","To":"Tom Rini , Simon Glass ,\n Quentin Schulz ,\n Kory Maincent ,\n Mattijs Korpershoek , Peng Fan ,\n Heinrich Schuchardt ,\n Martin Schwan ,\n Daniel Golle , Anshul Dalal ,\n Ilias Apalodimas ,\n Sughosh Ganu ,\n Aristo Chen ,\n Ludwig Nussel ,\n Benjamin ROBIN ,\n Marek Vasut ,\n James Hilliard ,\n Wolfgang Wallner ,\n Kunihiko Hayashi ,\n David Lechner ,\n Neil Armstrong ,\n Mayuresh Chitale ,\n Jonas Karlman , Shiji Yang ,\n Rasmus Villemoes ,\n Francois Berder , u-boot@lists.denx.de","Subject":"[PATCH v2 6/7] test: boot: add runtime unit test for\n fit_verity_build_cmdline()","Message-ID":"\n <97e38b81f2e8f54ec819940d360849e4cf61b875.1776302806.git.daniel@makrotopia.org>","References":"","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Add test/boot/fit_verity.c with four tests that construct FIT blobs\nin memory and exercise fit_verity_build_cmdline().\n\nSigned-off-by: Daniel Golle \n---\nv2: new patch\n\n test/boot/Makefile | 1 +\n test/boot/fit_verity.c | 298 +++++++++++++++++++++++++++++++++++++++++\n test/cmd_ut.c | 2 +\n 3 files changed, 301 insertions(+)\n create mode 100644 test/boot/fit_verity.c","diff":"diff --git a/test/boot/Makefile b/test/boot/Makefile\nindex 89538d4f0a6..d98f212b243 100644\n--- a/test/boot/Makefile\n+++ b/test/boot/Makefile\n@@ -15,6 +15,7 @@ endif\n ifdef CONFIG_SANDBOX\n obj-$(CONFIG_$(PHASE_)CMDLINE) += bootm.o\n endif\n+obj-$(CONFIG_$(PHASE_)FIT_VERITY) += fit_verity.o\n obj-$(CONFIG_MEASURED_BOOT) += measurement.o\n \n ifdef CONFIG_OF_LIVE\ndiff --git a/test/boot/fit_verity.c b/test/boot/fit_verity.c\nnew file mode 100644\nindex 00000000000..40c54998387\n--- /dev/null\n+++ b/test/boot/fit_verity.c\n@@ -0,0 +7,302 @@\n+// SPDX-License-Identifier: GPL-2.0+\n+/*\n+ * Tests for FIT dm-verity cmdline generation\n+ *\n+ * Copyright 2026 Daniel Golle \n+ */\n+\n+#include \n+#include \n+#include \n+\n+#define FIT_VERITY_TEST(_name, _flags)\tUNIT_TEST(_name, _flags, fit_verity)\n+\n+/* FIT blob buffer size — generous to avoid FDT_ERR_NOSPACE */\n+#define FIT_BUF_SIZE\t4096\n+\n+/* Test digest (32 bytes = sha256) */\n+static const u8 test_digest[32] = {\n+\t0x8e, 0x67, 0x91, 0x63, 0x7f, 0x93, 0xcb, 0xb8,\n+\t0x1f, 0xc4, 0x52, 0x99, 0xe2, 0x03, 0xcb, 0xe8,\n+\t0x5c, 0xa2, 0xe4, 0x7a, 0x38, 0xf5, 0x05, 0x1b,\n+\t0xdd, 0xee, 0xce, 0x92, 0xd7, 0xb1, 0xc9, 0xf9,\n+};\n+\n+/* Test salt (32 bytes) */\n+static const u8 test_salt[32] = {\n+\t0xaa, 0x7b, 0x11, 0xf8, 0xdb, 0x8f, 0xe2, 0xe5,\n+\t0xbf, 0xd4, 0xec, 0xa1, 0xd1, 0x8a, 0x22, 0xb5,\n+\t0xde, 0x7e, 0xa3, 0x9d, 0x2e, 0x1b, 0x93, 0xbb,\n+\t0x72, 0x72, 0xce, 0x0c, 0x6c, 0xa3, 0xcc, 0x8e,\n+};\n+\n+/**\n+ * build_verity_fit() - construct a minimal FIT blob with dm-verity metadata\n+ * @buf:\t\toutput buffer (at least FIT_BUF_SIZE bytes)\n+ * @num_loadables:\tnumber of filesystem loadables to create (1 or 2)\n+ *\n+ * Builds a FIT blob containing:\n+ * - /images/rootfsN with type=\"filesystem\" and a dm-verity subnode\n+ * - /configurations/conf-1 referencing the loadable(s)\n+ *\n+ * Return: configuration node offset, or -ve on error\n+ */\n+static int build_verity_fit(void *buf, int num_loadables)\n+{\n+\tint images_node, conf_node, confs_node, img_node, verity_node;\n+\tfdt32_t val;\n+\tint ret, i;\n+\tchar name[32];\n+\t/*\n+\t * Build the loadables string list. FDT stringlists are concatenated\n+\t * NUL-terminated strings. E.g. \"rootfs0\\0rootfs1\\0\"\n+\t */\n+\tchar loadables[128];\n+\tint loadables_len = 0;\n+\n+\tret = fdt_create_empty_tree(buf, FIT_BUF_SIZE);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* /images */\n+\timages_node = fdt_add_subnode(buf, 0, \"images\");\n+\tif (images_node < 0)\n+\t\treturn images_node;\n+\n+\tfor (i = 0; i < num_loadables; i++) {\n+\t\tsnprintf(name, sizeof(name), \"rootfs%d\", i);\n+\n+\t\timg_node = fdt_add_subnode(buf, images_node, name);\n+\t\tif (img_node < 0)\n+\t\t\treturn img_node;\n+\n+\t\tret = fdt_setprop_string(buf, img_node, \"type\", \"filesystem\");\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tverity_node = fdt_add_subnode(buf, img_node, \"dm-verity\");\n+\t\tif (verity_node < 0)\n+\t\t\treturn verity_node;\n+\n+\t\tret = fdt_setprop_string(buf, verity_node, \"algo\", \"sha256\");\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tval = cpu_to_fdt32(4096);\n+\t\tret = fdt_setprop(buf, verity_node, \"data-block-size\",\n+\t\t\t\t &val, sizeof(val));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tret = fdt_setprop(buf, verity_node, \"hash-block-size\",\n+\t\t\t\t &val, sizeof(val));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tval = cpu_to_fdt32(100);\n+\t\tret = fdt_setprop(buf, verity_node, \"num-data-blocks\",\n+\t\t\t\t &val, sizeof(val));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tval = cpu_to_fdt32(100);\n+\t\tret = fdt_setprop(buf, verity_node, \"hash-start-block\",\n+\t\t\t\t &val, sizeof(val));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tret = fdt_setprop(buf, verity_node, \"digest\",\n+\t\t\t\t test_digest, sizeof(test_digest));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tret = fdt_setprop(buf, verity_node, \"salt\",\n+\t\t\t\t test_salt, sizeof(test_salt));\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\t/* Append to loadables stringlist */\n+\t\tloadables_len += snprintf(loadables + loadables_len,\n+\t\t\t\t\t sizeof(loadables) - loadables_len,\n+\t\t\t\t\t \"%s\", name) + 1;\n+\t}\n+\n+\t/* /configurations/conf-1 */\n+\tconfs_node = fdt_add_subnode(buf, 0, \"configurations\");\n+\tif (confs_node < 0)\n+\t\treturn confs_node;\n+\n+\tconf_node = fdt_add_subnode(buf, confs_node, \"conf-1\");\n+\tif (conf_node < 0)\n+\t\treturn conf_node;\n+\n+\tret = fdt_setprop(buf, conf_node, \"loadables\",\n+\t\t\t loadables, loadables_len);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn conf_node;\n+}\n+\n+/* Test: single dm-verity loadable produces correct cmdline fragments */\n+static int fit_verity_test_single(struct unit_test_state *uts)\n+{\n+\tchar buf[FIT_BUF_SIZE];\n+\tstruct bootm_headers images;\n+\tint conf_noffset;\n+\n+\tconf_noffset = build_verity_fit(buf, 1);\n+\tut_assert(conf_noffset >= 0);\n+\n+\tmemset(&images, 0, sizeof(images));\n+\tut_assertok(fit_verity_build_cmdline(buf, conf_noffset, &images));\n+\n+\t/* dm_mod_create should contain the target spec for rootfs0 */\n+\tut_assertnonnull(images.dm_mod_create);\n+\tut_assert(strstr(images.dm_mod_create, \"rootfs0,,,\"));\n+\tut_assert(strstr(images.dm_mod_create, \"verity 1\"));\n+\tut_assert(strstr(images.dm_mod_create, \"/dev/fit0\"));\n+\tut_assert(strstr(images.dm_mod_create, \"4096 4096 100 100\"));\n+\tut_assert(strstr(images.dm_mod_create, \"sha256\"));\n+\t/* Check hex-encoded digest prefix */\n+\tut_assert(strstr(images.dm_mod_create, \"8e6791637f93cbb8\"));\n+\t/* Check hex-encoded salt prefix */\n+\tut_assert(strstr(images.dm_mod_create, \"aa7b11f8db8fe2e5\"));\n+\n+\t/* dm_mod_waitfor should reference /dev/fit0 */\n+\tut_assertnonnull(images.dm_mod_waitfor);\n+\tut_asserteq_str(\"/dev/fit0\", images.dm_mod_waitfor);\n+\n+\tfit_verity_free(&images);\n+\tut_assertnull(images.dm_mod_create);\n+\tut_assertnull(images.dm_mod_waitfor);\n+\n+\treturn 0;\n+}\n+\n+FIT_VERITY_TEST(fit_verity_test_single, 0);\n+\n+/* Test: FIT with no dm-verity subnode returns 0, pointers stay NULL */\n+static int fit_verity_test_no_verity(struct unit_test_state *uts)\n+{\n+\tchar buf[FIT_BUF_SIZE];\n+\tstruct bootm_headers images;\n+\tint conf_node, images_node, img_node, confs_node;\n+\tint ret;\n+\n+\tret = fdt_create_empty_tree(buf, FIT_BUF_SIZE);\n+\tut_assertok(ret);\n+\n+\timages_node = fdt_add_subnode(buf, 0, \"images\");\n+\tut_assert(images_node >= 0);\n+\n+\timg_node = fdt_add_subnode(buf, images_node, \"rootfs\");\n+\tut_assert(img_node >= 0);\n+\tut_assertok(fdt_setprop_string(buf, img_node, \"type\", \"filesystem\"));\n+\t/* No dm-verity subnode */\n+\n+\tconfs_node = fdt_add_subnode(buf, 0, \"configurations\");\n+\tut_assert(confs_node >= 0);\n+\tconf_node = fdt_add_subnode(buf, confs_node, \"conf-1\");\n+\tut_assert(conf_node >= 0);\n+\tut_assertok(fdt_setprop_string(buf, conf_node, \"loadables\", \"rootfs\"));\n+\n+\tmemset(&images, 0, sizeof(images));\n+\tut_asserteq(0, fit_verity_build_cmdline(buf, conf_node, &images));\n+\tut_assertnull(images.dm_mod_create);\n+\tut_assertnull(images.dm_mod_waitfor);\n+\n+\treturn 0;\n+}\n+\n+FIT_VERITY_TEST(fit_verity_test_no_verity, 0);\n+\n+/* Test: two dm-verity loadables produce combined cmdline */\n+static int fit_verity_test_two_loadables(struct unit_test_state *uts)\n+{\n+\tchar buf[FIT_BUF_SIZE];\n+\tstruct bootm_headers images;\n+\tint conf_noffset;\n+\n+\tconf_noffset = build_verity_fit(buf, 2);\n+\tut_assert(conf_noffset >= 0);\n+\n+\tmemset(&images, 0, sizeof(images));\n+\tut_assertok(fit_verity_build_cmdline(buf, conf_noffset, &images));\n+\n+\t/* Both targets should appear, separated by \";\" */\n+\tut_assertnonnull(images.dm_mod_create);\n+\tut_assert(strstr(images.dm_mod_create, \"rootfs0,,,\"));\n+\tut_assert(strstr(images.dm_mod_create, \";rootfs1,,,\"));\n+\tut_assert(strstr(images.dm_mod_create, \"/dev/fit0\"));\n+\tut_assert(strstr(images.dm_mod_create, \"/dev/fit1\"));\n+\n+\t/* dm_mod_waitfor should list both devices */\n+\tut_assertnonnull(images.dm_mod_waitfor);\n+\tut_assert(strstr(images.dm_mod_waitfor, \"/dev/fit0\"));\n+\tut_assert(strstr(images.dm_mod_waitfor, \"/dev/fit1\"));\n+\n+\tfit_verity_free(&images);\n+\treturn 0;\n+}\n+\n+FIT_VERITY_TEST(fit_verity_test_two_loadables, 0);\n+\n+/* Test: invalid block size (not power of two) returns -EINVAL */\n+static int fit_verity_test_bad_blocksize(struct unit_test_state *uts)\n+{\n+\tchar buf[FIT_BUF_SIZE];\n+\tstruct bootm_headers images;\n+\tint images_node, conf_node, confs_node, img_node, verity_node;\n+\tfdt32_t val;\n+\tint ret;\n+\n+\tret = fdt_create_empty_tree(buf, FIT_BUF_SIZE);\n+\tut_assertok(ret);\n+\n+\timages_node = fdt_add_subnode(buf, 0, \"images\");\n+\tut_assert(images_node >= 0);\n+\n+\timg_node = fdt_add_subnode(buf, images_node, \"rootfs\");\n+\tut_assert(img_node >= 0);\n+\tut_assertok(fdt_setprop_string(buf, img_node, \"type\", \"filesystem\"));\n+\n+\tverity_node = fdt_add_subnode(buf, img_node, \"dm-verity\");\n+\tut_assert(verity_node >= 0);\n+\n+\tut_assertok(fdt_setprop_string(buf, verity_node, \"algo\", \"sha256\"));\n+\n+\t/* 3000 is not a power of two */\n+\tval = cpu_to_fdt32(3000);\n+\tut_assertok(fdt_setprop(buf, verity_node, \"data-block-size\",\n+\t\t\t\t&val, sizeof(val)));\n+\tval = cpu_to_fdt32(4096);\n+\tut_assertok(fdt_setprop(buf, verity_node, \"hash-block-size\",\n+\t\t\t\t&val, sizeof(val)));\n+\n+\tval = cpu_to_fdt32(100);\n+\tut_assertok(fdt_setprop(buf, verity_node, \"num-data-blocks\",\n+\t\t\t\t&val, sizeof(val)));\n+\tut_assertok(fdt_setprop(buf, verity_node, \"hash-start-block\",\n+\t\t\t\t&val, sizeof(val)));\n+\n+\tut_assertok(fdt_setprop(buf, verity_node, \"digest\",\n+\t\t\t\ttest_digest, sizeof(test_digest)));\n+\tut_assertok(fdt_setprop(buf, verity_node, \"salt\",\n+\t\t\t\ttest_salt, sizeof(test_salt)));\n+\n+\tconfs_node = fdt_add_subnode(buf, 0, \"configurations\");\n+\tut_assert(confs_node >= 0);\n+\tconf_node = fdt_add_subnode(buf, confs_node, \"conf-1\");\n+\tut_assert(conf_node >= 0);\n+\tut_assertok(fdt_setprop_string(buf, conf_node, \"loadables\", \"rootfs\"));\n+\n+\tmemset(&images, 0, sizeof(images));\n+\tut_asserteq(-EINVAL, fit_verity_build_cmdline(buf, conf_node, &images));\n+\tut_assertnull(images.dm_mod_create);\n+\tut_assertnull(images.dm_mod_waitfor);\n+\n+\treturn 0;\n+}\n+\n+FIT_VERITY_TEST(fit_verity_test_bad_blocksize, 0);\ndiff --git a/test/cmd_ut.c b/test/cmd_ut.c\nindex 44e5fdfdaa6..d1b376f617c 100644\n--- a/test/cmd_ut.c\n+++ b/test/cmd_ut.c\n@@ -59,6 +59,7 @@ SUITE_DECL(env);\n SUITE_DECL(exit);\n SUITE_DECL(fdt);\n SUITE_DECL(fdt_overlay);\n+SUITE_DECL(fit_verity);\n SUITE_DECL(font);\n SUITE_DECL(hush);\n SUITE_DECL(lib);\n@@ -86,6 +87,7 @@ static struct suite suites[] = {\n \tSUITE(exit, \"shell exit and variables\"),\n \tSUITE(fdt, \"fdt command\"),\n \tSUITE(fdt_overlay, \"device tree overlays\"),\n+\tSUITE(fit_verity, \"FIT dm-verity cmdline generation\"),\n \tSUITE(font, \"font command\"),\n \tSUITE(hush, \"hush behaviour\"),\n \tSUITE(lib, \"library functions\"),\n","prefixes":["v2","6/7"]}