From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UK99U-0004Lo-TQ for kexec@lists.infradead.org; Mon, 25 Mar 2013 15:17:38 +0000 Received: by mail-pb0-f49.google.com with SMTP id um15so471276pbc.22 for ; Mon, 25 Mar 2013 08:17:35 -0700 (PDT) Message-ID: <51506A89.2010501@gmail.com> Date: Mon, 25 Mar 2013 23:17:29 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH 12/13] kexec: x86_64: elf: fix memory leak caused by get_command_line References: <51506758.4070902@gmail.com> In-Reply-To: <51506758.4070902@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Simon Horman Cc: "kexec@lists.infradead.org" From: Zhang Yanfei 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 --- kexec/arch/x86_64/kexec-elf-x86_64.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kexec/arch/x86_64/kexec-elf-x86_64.c b/kexec/arch/x86_64/kexec-elf-x86_64.c index a3fc728..4a41780 100644 --- a/kexec/arch/x86_64/kexec-elf-x86_64.c +++ b/kexec/arch/x86_64/kexec-elf-x86_64.c @@ -89,6 +89,7 @@ int elf_x86_64_load(int argc, char **argv, const char *buf, off_t len, struct mem_ehdr ehdr; const char *append = NULL; char *command_line = NULL, *modified_cmdline; + char *tmp_cmdline = NULL; int command_line_len; const char *ramdisk; unsigned long entry, max_addr; @@ -135,7 +136,7 @@ int elf_x86_64_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; @@ -155,7 +156,9 @@ int elf_x86_64_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 kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec