leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/bootconfig: Fix resource leak in apply_xbc()

Browse Source 
Fix the @data and @fd allocations that are leaked in the error path of
apply_xbc().

Link: http://lkml.kernel.org/r/583a49c9-c27a-931d-e6c2-6f63a4b18bea@huawei.com

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Yunfeng Ye 2020-05-07 17:23:36 +08:00 committed by Steven Rostedt (VMware)
parent 192b7993b3
commit 8842604446
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/bootconfig/main.c
View File

@ -314,6 +314,7 @@ int apply_xbc(const char *path, const char *xbc_path)
ret = delete_xbc(path); ret = delete_xbc(path);
if (ret < 0) { if (ret < 0) {
pr_err("Failed to delete previous boot config: %d\n", ret); pr_err("Failed to delete previous boot config: %d\n", ret);
free(data);
return ret; return ret;
} }
@ -321,24 +322,26 @@ int apply_xbc(const char *path, const char *xbc_path)
fd = open(path, O_RDWR | O_APPEND); fd = open(path, O_RDWR | O_APPEND);
if (fd < 0) { if (fd < 0) {
pr_err("Failed to open %s: %d\n", path, fd); pr_err("Failed to open %s: %d\n", path, fd);
free(data);
return fd; return fd;
} }
/* TODO: Ensure the @path is initramfs/initrd image */ /* TODO: Ensure the @path is initramfs/initrd image */
ret = write(fd, data, size + 8); ret = write(fd, data, size + 8);
if (ret < 0) { if (ret < 0) {
pr_err("Failed to apply a boot config: %d\n", ret); pr_err("Failed to apply a boot config: %d\n", ret);
return ret; goto out;
} }
/* Write a magic word of the bootconfig */ /* Write a magic word of the bootconfig */
ret = write(fd, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN); ret = write(fd, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
if (ret < 0) { if (ret < 0) {
pr_err("Failed to apply a boot config magic: %d\n", ret); pr_err("Failed to apply a boot config magic: %d\n", ret);
return ret; goto out;
} }
out:
close(fd); close(fd);
free(data); free(data);
return 0; return ret;
} }
int usage(void) int usage(void)