renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 16:23:51 +08:00
Code

tools/bootconfig: Store size and checksum in footer as le32

Browse Source 
Store the size and the checksum fields in the footer as le32
instead of u32. This will allow us to apply bootconfig to the
cross build initrd without caring the endianness.

Link: https://lkml.kernel.org/r/160583935332.547349.5897811300636587426.stgit@devnote2

Reported-by: Steven Rostedt <rostedt@goodmis.org>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2020-11-20 11:29:13 +09:00 committed by Steven Rostedt (VMware)
parent 24aed09451
commit e86843580d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/bootconfig/main.c
View File

@ -10,6 +10,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <endian.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bootconfig.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) if (read(fd, &size, sizeof(u32)) < 0)
return pr_errno("Failed to read size", -errno); return pr_errno("Failed to read size", -errno);
size = le32toh(size);
if (read(fd, &csum, sizeof(u32)) < 0) if (read(fd, &csum, sizeof(u32)) < 0)
return pr_errno("Failed to read checksum", -errno); return pr_errno("Failed to read checksum", -errno);
csum = le32toh(csum);
/* Wrong size error */ /* Wrong size error */
if (stat.st_size < size + 8 + BOOTCONFIG_MAGIC_LEN) { 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 */ /* Add a footer */
p = data + size; p = data + size;
*(u32 *)p = size; *(u32 *)p = htole32(size);
p += sizeof(u32); p += sizeof(u32);
*(u32 *)p = csum; *(u32 *)p = htole32(csum);
p += sizeof(u32); p += sizeof(u32);
memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN); memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);