initramfs_test: test header fields with 0x hex prefix

cpio header fields are 8-byte hex strings, but one "interesting"
side-effect of our historic simple_str[n]toul() use means that a "0x"
(or "0X") prefixed header field will be successfully processed when
coupled alongside a 6-byte hex remainder string.

"0x" prefix support is contrary to the initramfs specification at
Documentation/driver-api/early-userspace/buffer-format.rst which states:

  The structure of the cpio_header is as follows (all fields contain
  hexadecimal ASCII numbers fully padded with '0' on the left to the
  full width of the field, for example, the integer 4780 is represented
  by the ASCII string "000012ac"):

Test for this corner case by injecting "0x" prefixes into the uid, gid
and namesize cpio header fields. Confirm that init_stat() returns
matching uid and gid values.

This test can be modified in future to expect unpack_to_rootfs() failure
when header validation is changed to properly follow the specification.

Add some missing struct kstat initializations to account for possible
init_stat() failures.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Link: https://patch.msgid.link/20260331070519.5974-3-ddiss@suse.de
Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/init/initramfs_test.c b/init/initramfs_test.c
index 6fe1c44a74a586d1822efc85a71ecbf2e2c428cc..b9f83dc194aa69cd54d4a6b52d70444ab298fc7d 100644 (file)
--- a/init/initramfs_test.c
+++ b/init/initramfs_test.c
@@ -316,7 +316,7 @@ static void __init initramfs_test_hardlink(struct kunit *test)
 {
        char *err, *cpio_srcbuf;
        size_t len;
-       struct kstat st0, st1;
+       struct kstat st0 = {}, st1 = {};
        struct initramfs_test_cpio c[] = { {
                .magic = "070701",
                .ino = 1,
@@ -461,7 +461,7 @@ static void __init initramfs_test_fname_path_max(struct kunit *test)
 {
        char *err;
        size_t len;
-       struct kstat st0, st1;
+       struct kstat st0 = {}, st1 = {};
        char fdata[] = "this file data will not be unpacked";
        struct test_fname_path_max {
                char fname_oversize[PATH_MAX + 1];
@@ -504,6 +504,61 @@ static void __init initramfs_test_fname_path_max(struct kunit *test)
        kfree(tbufs);
 }
 
+static void __init initramfs_test_hdr_hex(struct kunit *test)
+{
+       char *err;
+       size_t len;
+       struct kstat st0 = {}, st1 = {};
+       char fdata[] = "this file data will be unpacked";
+       struct initramfs_test_bufs {
+               char cpio_src[(CPIO_HDRLEN + PATH_MAX + 3 + sizeof(fdata)) * 2];
+       } *tbufs = kzalloc(sizeof(struct initramfs_test_bufs), GFP_KERNEL);
+       struct initramfs_test_cpio c[] = { {
+               .magic = "070701",
+               .ino = 1,
+               .mode = S_IFREG | 0777,
+               .uid = 0x123456,
+               .gid = 0x123457,
+               .nlink = 1,
+               .namesize = sizeof("initramfs_test_hdr_hex_0"),
+               .fname = "initramfs_test_hdr_hex_0",
+               .filesize = sizeof(fdata),
+               .data = fdata,
+       }, {
+               .magic = "070701",
+               .ino = 2,
+               .mode = S_IFDIR | 0777,
+               .uid = 0x000056,
+               .gid = 0x000057,
+               .nlink = 1,
+               .namesize = sizeof("initramfs_test_hdr_hex_1"),
+               .fname = "initramfs_test_hdr_hex_1",
+       } };
+
+       /* inject_ox=true to add "0x" cpio field prefixes */
+       len = fill_cpio(c, ARRAY_SIZE(c), true, tbufs->cpio_src);
+
+       err = unpack_to_rootfs(tbufs->cpio_src, len);
+       KUNIT_EXPECT_NULL(test, err);
+
+       KUNIT_EXPECT_EQ(test, init_stat(c[0].fname, &st0, 0), 0);
+       KUNIT_EXPECT_EQ(test, init_stat(c[1].fname, &st1, 0), 0);
+
+       KUNIT_EXPECT_TRUE(test,
+               uid_eq(st0.uid, make_kuid(current_user_ns(), (uid_t)0x123456)));
+       KUNIT_EXPECT_TRUE(test,
+               gid_eq(st0.gid, make_kgid(current_user_ns(), (gid_t)0x123457)));
+       KUNIT_EXPECT_TRUE(test,
+               uid_eq(st1.uid, make_kuid(current_user_ns(), (uid_t)0x56)));
+       KUNIT_EXPECT_TRUE(test,
+               gid_eq(st1.gid, make_kgid(current_user_ns(), (gid_t)0x57)));
+
+       KUNIT_EXPECT_EQ(test, init_unlink(c[0].fname), 0);
+       KUNIT_EXPECT_EQ(test, init_rmdir(c[1].fname), 0);
+
+       kfree(tbufs);
+}
+
 /*
  * The kunit_case/_suite struct cannot be marked as __initdata as this will be
  * used in debugfs to retrieve results after test has run.
@@ -517,6 +572,7 @@ static struct kunit_case __refdata initramfs_test_cases[] = {
        KUNIT_CASE(initramfs_test_many),
        KUNIT_CASE(initramfs_test_fname_pad),
        KUNIT_CASE(initramfs_test_fname_path_max),
+       KUNIT_CASE(initramfs_test_hdr_hex),
        {},
 };