Merge tag 'trace-v5.10-rc6-bootconfig' of... (8a02ec8f) · Commits · 戴 / test

Documentation/admin-guide/bootconfig.rst

+3 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,9 @@ Since the boot configuration file is loaded with initrd, it will be added
		to the end of the initrd (initramfs) image file with padding, size,
		checksum and 12-byte magic word as below.

		[initrd][bootconfig][padding][size(u32)][checksum(u32)][#BOOTCONFIG\n]
		[initrd][bootconfig][padding][size(le32)][checksum(le32)][#BOOTCONFIG\n]

		The size and checksum fields are unsigned 32bit little endian value.

		When the boot configuration is added to the initrd image, the total
		file size is aligned to 4 bytes. To fill the gap, null characters

+2 −2

Original line number	Diff line number	Diff line
		@@ -288,8 +288,8 @@ static void * __init get_boot_config_from_initrd(u32 _size, u32 _csum)

		found:
		hdr = (u32 *)(data - 8);
		size = hdr[0];
		csum = hdr[1];
		size = le32_to_cpu(hdr[0]);
		csum = le32_to_cpu(hdr[1]);

		data = ((void *)hdr) - size;
		if ((unsigned long)data < initrd_start) {

+5 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		#include <unistd.h>
		#include <string.h>
		#include <errno.h>
		#include <endian.h>

		#include <linux/kernel.h>
		#include <linux/bootconfig.h>
		@@ -183,9 +184,11 @@ static int load_xbc_from_initrd(int fd, char **buf)

		if (read(fd, &size, sizeof(u32)) < 0)
		return pr_errno("Failed to read size", -errno);
		size = le32toh(size);

		if (read(fd, &csum, sizeof(u32)) < 0)
		return pr_errno("Failed to read checksum", -errno);
		csum = le32toh(csum);

		/* Wrong size error */
		if (stat.st_size < size + 8 + BOOTCONFIG_MAGIC_LEN) {
		@@ -407,10 +410,10 @@ static int apply_xbc(const char path, const char xbc_path)

		/* Add a footer */
		p = data + size;
		(u32 )p = size;
		(u32 )p = htole32(size);
		p += sizeof(u32);

		(u32 )p = csum;
		(u32 )p = htole32(csum);
		p += sizeof(u32);

		memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);