From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793394618; b=LgJwugD5deQ98ux2+QmHc4YRw/dU5jv7WyFMK6SsQNCK+iRVrkLXhOtfzprm12W5O8fw o6zVEZWDSao2UPQMaERqdRG+TM/N93M0NZW7fENFGriSyHvDc5a1ogZkVWAHsOvk+0xPl hMf17xhyWHASHkUNJVcHeIFTUo5K4OgKCN8ManJbiQqDcglny2HS15GQTgn58LtvrrD3y jhK/kF5DtEeMAbgi4zzf7JW5oi6ajONOv8rsog1cVxDMVdM0cILRi1kSrY0KjdRPtJIzt LGIk/ZoJoseT9wLmf+GQHG+6Dx6EmRxe330VIs8wR8CquPQC3+BzqkVxCNoNPodS+YQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793394618; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=I0lofktk4aVZckRcCcRV6QntITM4Mli1YlgsaCWlDa8=; b=gNaGLcG8KLQAPjlOSyLMKlyr9apcHHZIWhMrk8/KNxNRRGY21+sG9U8iDv/nZwUMscDv kgK2SpYckdkVFI4By/qGuHNY7H+j66UnW9TLeQdviy0uYLVR1ZdwoNhnv0qEfZdv9RbDV nIL73rQ2ZnxJqjcDiOwP4sKr1bzrr1v1wSIH32Aj0+WP1DCevLCQGnlAwYm406hCBnhQE JvcYbVwCiWYcgyg5C4wsDtumV9nBNpFXggEqvFCR01UozxBXjopKPaTJ2CUG/jFDl0OSt rFdRWOJraXxhrxhe/gNAMmGe2ShswU1BhBOous7yXqSeI1jqAP97h+kQsF2HFburJGw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=arista.com; spf=pass smtp.mailfrom=arista.com; dkim=pass header.d=arista.com header.i=@arista.com header.a=rsa-sha256 header.s=google header.b=kRsN7yMw; arc=none smtp.remote-ip=74.125.82.50 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F2A460A2608 for ; Fri, 30 Oct 2026 21:10:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0F2A460A2608 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=arista.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arista.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=arista.com header.i=@arista.com header.a=rsa-sha256 header.s=google header.b=kRsN7yMw Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-18cdcfc05ffso1545581c88.1 for ; Fri, 30 Oct 2026 14:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1793394616; x=1793999416; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=I0lofktk4aVZckRcCcRV6QntITM4Mli1YlgsaCWlDa8=; b=kRsN7yMwZgo28qTV/TO991Yy79ioZOc1J/0OwfKZdoy2ilaKYyxsHvjf34ppy3wwRF o+cs63h1F0blKJiAP5DtQWfytFi5lzxJYAA8MPOTl0MXJ93rtgjVYx8VZ0W6opwrI0RT 9VMxk3rMzImpbwZssM0gBkO5ukGpqtec+0RRoWnp2Ik6GpP8ZIaOL//y9zNyuwI73jQC RHkSfwPQ/D2rCBBTlopvsRjY5An/2NTZWl9BNV0/6oGYh0aTO6EC8WNXUT/VezLZLEzu CTPHvT7PKf4cetvsPka7QQqZLpDiLog/p1Lwt1roGDnZXvIInTq1y/Ekzo0c83+it/9V v53g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793394616; x=1793999416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=I0lofktk4aVZckRcCcRV6QntITM4Mli1YlgsaCWlDa8=; b=dLYo060A0l3Q3IeH/CwgWfO52S9TipOI2JOoQfI5EX2l1UD+Q1uD5BP8ALcEA1L9YC gk3F+jZXUVGSEAc2U1GOuTMnXZAU0Xy3fh42ZjdtTF7dXPws6jlwiXxg/khgbzEsrDXl qNEMX73trFrX9FnkzvBpe3HETIW/ZadT3/lizanjFdcYM4RqXnQPhtYeU2FnAJ/G8Vse VOPz/jZ4vmm+mB44OhXAyat4SUWxDVqc2yL73kF9A4lnMG6TIQuGsqJIVLhX1bp7zNBl C01H1sr09/pwu+//JfmaAG500nyaJY0WB36GCdCySqwVr11wvBro/eX3aQ0X3omnrLaW +oFA== X-Forwarded-Encrypted: i=1; AKwUvBx8wEk14vWSQ5uszsckzSrQT8nb7H2jx1fOel1ZdAjt+9xMlfRt1QBB5fckkgVr2qARTPf8BtyiwjtmailcGFKDETSgkgw=@vger.kernel.org X-Gm-Message-State: AFq9FYJP4lW1n0pn9wVk0zT8+3mVLUpNhb43h4JVPwXQosRkgX15H9ah rRlGE0TE7BNd6IZMxl/HW4n5EiB0TTciPxpXc347SKidZhJZhkFSyDdoZ+hP2YCtRw== X-Gm-Gg: AYBFou1mNYqGEzywlFrUuEzd+WNVVya+BSH4Q12zVplkriIULacuoUc6xJyB5fZi84n fE2ETNqy+6MaxZv0gTcMv1HADoOa76LJtdkjXukD6ui4Zl6LPaur53QFpgUlLtD/19Ic+oPSnRP CmP6zhLcU6NG54iOEnrSX0Avs+rzT3mvsu4dXigGmDtmygdqtxmv67s9M+rSJhuvvGduloxH7SE LfzpG8XBw9r1YMJ88QlDtu/JLe0DxaRndp+V2McO6uYW9NpyUsYpBAXxFnY0dZPjLg8WS2W9Aeh JfqwAAqz3irsyM96tgRHw2wU4oerV8XsjdxtsIYFFWHuDsVAOgJ8BXXoV28YIN48jqZBjkNaLuR B3skYe/F0JU+A1Hp9mcXsaxsmB37rmnf4E5pSQUexlk9jQ5G8pE8F8yV3ET3ztJRHDVCUApOCYB 9BDHoE58EDBXKlzZSv2vF/FPA+mFq043k5OORG56Bq82OidJpFcGAl2dR/sLpJA9JhhMfwRWYMV Zt9bHV8FlItNNh6FZeSTDJiqxvVKz0HIAH1EQSZifZ7ehCyB5qjIj/WpxYJ0tjpMfK1+EAy/pnK eNcv+WNUzOJ3/Sry3gWnPGFiPAyVcdDnzIQLH4GAekpxMKYUjg2c2tVMNhI8xI96sA2rQToosUr TkvnA4LC5Ygld2DCwNeGs6RM= X-Received: by 2002:a05:7022:ea56:10b0:176:a225:e364 with SMTP id a92af1059eb24-1ac5de547afmr4542282c88.35.1793394615874; Fri, 30 Oct 2026 14:10:15 -0700 (PDT) Received: from dannyhu-upstreamLinux.sjc.aristanetworks.com ([74.123.28.18]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1ac1abcf67csm9471777c88.21.2026.10.30.14.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2026 14:10:15 -0700 (PDT) From: Danny Hu To: Alexander Viro , Christian Brauner Cc: Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Jan Kara , Victor Kamensky , Taras Kondratiuk , Tianxing Zhang , Zheng Zengkai , zhoushuiqing , zhangguangzhi , Danny Hu , Jason Yan , silviu.vlasceanu@huawei.com, hpa@zytor.com, arnd@arndb.de, rob@landley.net, james.w.mcmechan@gmail.com, niveditas98@gmail.com, pierre@arista.com, julien@arista.com, kbharathi@arista.com, erosca@de.adit-jv.com, alexandr.lobakin@intel.com, jim_baxter@mentor.com, linux-fsdevel@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kbuild@vger.kernel.org, initramfs@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, bug-cpio@gnu.org Subject: [PATCH v5 2/4] initramfs: add file metadata Date: Fri, 30 Oct 2026 14:09:41 -0700 Message-ID: <20261030210944.2143778-3-dannyhu@arista.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20261030210944.2143778-1-dannyhu@arista.com> References: <20261030210944.2143778-1-dannyhu@arista.com> X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mimi Zohar This patch adds metadata to a file from a supplied buffer. The buffer might contains multiple metadata records. The format of each record is: For now, only the TYPE_XATTR metadata type is supported. The specific format of this metadata type is: \0 [kamensky: fixed restoring of xattrs for symbolic links by using sys_lsetxattr() instead of sys_setxattr()] [sassu: removed state management, kept only do_setxattrs(), added support for generic file metadata, replaced sys_lsetxattr() with vfs_setxattr(), added check for entry_size, added check for hdr->c_size, replaced strlen() with strnlen(); moved do_setxattrs() before do_name()] [zhangguangzhi: fix checkpatch warning EMBEDDED_FILENAME in include/linux/initramfs.h] Signed-off-by: Mimi Zohar Signed-off-by: Victor Kamensky Signed-off-by: Taras Kondratiuk Signed-off-by: Roberto Sassu Signed-off-by: Tianxing Zhang Reviewed-by: Jason Yan Signed-off-by: Zheng Zengkai Signed-off-by: zhoushuiqing Signed-off-by: zhangguangzhi Signed-off-by: Danny Hu --- Changes in v5: - For debug print in do_setxattrs(), use print_hex_dump_debug() rather than printing the xattr value as a string - Use u32 metadata record lengths and reject records smaller than their header include/linux/initramfs.h | 19 +++++++++ init/initramfs.c | 89 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 include/linux/initramfs.h diff --git a/include/linux/initramfs.h b/include/linux/initramfs.h new file mode 100644 index 000000000000..9b3839dc88a1 --- /dev/null +++ b/include/linux/initramfs.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Include file for file metadata in the initial ram disk. + */ +#ifndef _LINUX_INITRAMFS_H +#define _LINUX_INITRAMFS_H + +#define METADATA_FILENAME "METADATA!!!" + +enum metadata_types { TYPE_NONE, TYPE_XATTR, TYPE__LAST }; + +struct metadata_hdr { + char c_size[8]; /* total size including c_size field */ + char c_version; /* header version */ + char c_type; /* metadata type */ + char c_metadata[]; /* metadata */ +} __packed; + +#endif /*LINUX_INITRAMFS_H*/ diff --git a/init/initramfs.c b/init/initramfs.c index ebddde9c8f0d..36254dba7822 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,7 @@ #include #include #include +#include #include @@ -189,7 +191,7 @@ static __initdata time64_t mtime; static __initdata unsigned long ino, major, minor, nlink; static __initdata umode_t mode; -static __initdata unsigned long body_len, name_len; +static __initdata unsigned long body_len, name_len, metadata_len; static __initdata uid_t uid; static __initdata gid_t gid; static __initdata unsigned rdev; @@ -264,6 +266,7 @@ static void __init read_into(char *buf, unsigned size, enum state next) } static __initdata char *header_buf, *symlink_buf, *name_buf; +static __initdata char *metadata_buf; static int __init do_start(void) { @@ -365,6 +368,90 @@ static int __init maybe_link(void) return 0; } +static int __init do_setxattrs(char *pathname, char *buf, size_t size) +{ + struct path path; + char *xattr_name, *xattr_value; + uint32_t xattr_name_size, xattr_value_size; + int ret; + + xattr_name = buf; + xattr_name_size = strnlen(xattr_name, size); + if (xattr_name_size == size) { + error("malformed xattrs"); + return -EINVAL; + } + + xattr_value = xattr_name + xattr_name_size + 1; + xattr_value_size = buf + size - xattr_value; + + ret = kern_path(pathname, 0, &path); + if (!ret) { + ret = vfs_setxattr(&nop_mnt_idmap, path.dentry, xattr_name, xattr_value, + xattr_value_size, 0); + + path_put(&path); + } + + pr_debug("%s: %s size: %u (ret: %d)\n", pathname, xattr_name, + xattr_value_size, ret); + print_hex_dump_debug("xattr value: ", DUMP_PREFIX_OFFSET, + 16, 1, xattr_value, xattr_value_size, false); + + return ret; +} + +static int __init __maybe_unused do_parse_metadata(char *pathname) +{ + char *buf = metadata_buf; + char *bufend = metadata_buf + metadata_len; + struct metadata_hdr *hdr; + char str[sizeof(hdr->c_size) + 1]; + uint32_t entry_size; + + if (!metadata_len) + return 0; + + str[sizeof(hdr->c_size)] = 0; + + while (buf < bufend) { + int ret; + + if (buf + sizeof(*hdr) > bufend) { + error("malformed metadata"); + break; + } + + hdr = (struct metadata_hdr *)buf; + if (hdr->c_version != 1) { + pr_debug("Unsupported header version\n"); + break; + } + + memcpy(str, hdr->c_size, sizeof(hdr->c_size)); + ret = kstrtou32(str, 16, &entry_size); + if (ret || buf + entry_size > bufend || + entry_size < sizeof(*hdr)) { + error("malformed xattrs"); + break; + } + + switch (hdr->c_type) { + case TYPE_XATTR: + do_setxattrs(pathname, buf + sizeof(*hdr), + entry_size - sizeof(*hdr)); + break; + default: + pr_debug("Unsupported metadata type\n"); + break; + } + + buf += entry_size; + } + + return 0; +} + static __initdata struct file *wfile; static __initdata loff_t wfile_pos; -- 2.51.0