From: Zhang Yanfei <[email protected]> Since get_command_line returns dynamically allocated memory, it is easy for the caller to forget freeing the memory. Here fixes a memory leak caused by this function.
Signed-off-by: Zhang Yanfei <[email protected]> --- kexec/arch/x86_64/kexec-bzImage64.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kexec/arch/x86_64/kexec-bzImage64.c b/kexec/arch/x86_64/kexec-bzImage64.c index 86e6d13..21bc4ae 100644 --- a/kexec/arch/x86_64/kexec-bzImage64.c +++ b/kexec/arch/x86_64/kexec-bzImage64.c @@ -232,7 +232,7 @@ static int do_bzImage64_load(struct kexec_info *info, int bzImage64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info) { - char *command_line = NULL; + char *command_line = NULL, *tmp_cmdline = NULL; const char *ramdisk = NULL, *append = NULL; char *ramdisk_buf; off_t ramdisk_length = 0; @@ -269,7 +269,7 @@ int bzImage64_load(int argc, char **argv, const char *buf, off_t len, append = optarg; break; case OPT_REUSE_CMDLINE: - command_line = get_command_line(); + tmp_cmdline = get_command_line(); break; case OPT_RAMDISK: ramdisk = optarg; @@ -282,7 +282,9 @@ int bzImage64_load(int argc, char **argv, const char *buf, off_t len, break; } } - command_line = concat_cmdline(command_line, append); + command_line = concat_cmdline(tmp_cmdline, append); + if (tmp_cmdline) + free(tmp_cmdline); command_line_len = 0; if (command_line) command_line_len = strlen(command_line) + 1; -- 1.7.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
