AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 00:10:51 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/bootconfig: Fix to check the write failure correctly

Browse Source 
Fix to check the write(2) failure including partial write
correctly and try to rollback the partial write, because
if there is no BOOTCONFIG_MAGIC string, we can not remove it.

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

Fixes: 85c46b78da ("bootconfig: Add bootconfig magic word for indicating bootconfig explicitly")
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-19 14:53:31 +09:00 committed by Steven Rostedt (VMware)
parent a61ea6379a
commit a995e6bc05
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/bootconfig/main.c
View File

@ -337,6 +337,7 @@ static int delete_xbc(const char *path)
static int apply_xbc(const char *path, const char *xbc_path)
{
struct stat stat;
u32 size, csum;
char *buf, *data;
int ret, fd;
@ -394,16 +395,26 @@ static int apply_xbc(const char *path, const char *xbc_path)
return ret;
}
/* TODO: Ensure the @path is initramfs/initrd image */
ret = write(fd, data, size + 8);
if (ret < 0) {
pr_err("Failed to apply a boot config: %d\n", ret);
if (fstat(fd, &stat) < 0) {
pr_err("Failed to get the size of %s\n", path);
goto out;
}
ret = write(fd, data, size + 8);
if (ret < size + 8) {
if (ret < 0)
ret = -errno;
pr_err("Failed to apply a boot config: %d\n", ret);
if (ret < 0)
goto out;
goto out_rollback;
}
/* Write a magic word of the bootconfig */
ret = write(fd, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
if (ret < 0) {
if (ret < BOOTCONFIG_MAGIC_LEN) {
if (ret < 0)
ret = -errno;
pr_err("Failed to apply a boot config magic: %d\n", ret);
goto out;
goto out_rollback;
}
ret = 0;
out:
@ -411,6 +422,17 @@ static int apply_xbc(const char *path, const char *xbc_path)
free(data);
return ret;
out_rollback:
/* Map the partial write to -ENOSPC */
if (ret >= 0)
ret = -ENOSPC;
if (ftruncate(fd, stat.st_size) < 0) {
ret = -errno;
pr_err("Failed to rollback the write error: %d\n", ret);
pr_err("The initrd %s may be corrupted. Recommend to rebuild.\n", path);
}
goto out;
}
static int usage(void)