From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aXmS0-00038E-Be for mharc-grub-devel@gnu.org; Mon, 22 Feb 2016 04:06:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXmRu-00032A-MS for grub-devel@gnu.org; Mon, 22 Feb 2016 04:06:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXmRr-0003xj-FT for grub-devel@gnu.org; Mon, 22 Feb 2016 04:06:34 -0500 Received: from mx2.suse.de ([195.135.220.15]:36100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXmRr-0003xZ-1B for grub-devel@gnu.org; Mon, 22 Feb 2016 04:06:31 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 071D6AC0E; Mon, 22 Feb 2016 09:06:30 +0000 (UTC) Subject: Re: [PATCH v4 02/11] xen: avoid memleaks on error To: Daniel Kiper References: <1456120999-5639-1-git-send-email-jgross@suse.com> <1456120999-5639-3-git-send-email-jgross@suse.com> <20160222082432.GM3482@olila.local.net-space.pl> From: Juergen Gross Message-ID: <56CACF95.4070307@suse.com> Date: Mon, 22 Feb 2016 10:06:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160222082432.GM3482@olila.local.net-space.pl> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: grub-devel@gnu.org, phcoder@gmail.com, mchang@suse.com, xen-devel@lists.xen.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2016 09:06:39 -0000 On 22/02/16 09:24, Daniel Kiper wrote: > On Mon, Feb 22, 2016 at 07:03:10AM +0100, Juergen Gross wrote: >> When loading a Xen pv-kernel avoid memory leaks in case of errors. >> >> Signed-off-by: Juergen Gross >> --- >> grub-core/loader/i386/xen.c | 2 +- >> grub-core/loader/i386/xen_fileXX.c | 17 +++++++++++------ >> 2 files changed, 12 insertions(+), 7 deletions(-) >> >> diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c >> index 179e89c..f45f70f 100644 >> --- a/grub-core/loader/i386/xen.c >> +++ b/grub-core/loader/i386/xen.c >> @@ -563,7 +563,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), >> { >> err = grub_relocator_alloc_chunk_addr (relocator, &ch, max_addr, size); >> if (err) >> - return err; >> + goto fail; >> >> if (grub_initrd_load (&initrd_ctx, argv, >> get_virtual_current_address (ch))) >> diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c >> index 1ba5649..5475819 100644 >> --- a/grub-core/loader/i386/xen_fileXX.c >> +++ b/grub-core/loader/i386/xen_fileXX.c >> @@ -35,7 +35,8 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi, >> if (grub_file_read (elf->file, buf, sz) != (grub_ssize_t) sz) >> { >> if (grub_errno) >> - return grub_errno; >> + goto out; >> + grub_free (buf); >> return grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), >> elf->file->name); >> } >> @@ -123,14 +124,14 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi, >> { >> xi->virt_base = grub_strtoull (ptr + sizeof ("VIRT_BASE=") - 1, &ptr, 16); >> if (grub_errno) >> - return grub_errno; >> + goto out; >> continue; >> } >> if (grub_strncmp (ptr, "VIRT_ENTRY=", sizeof ("VIRT_ENTRY=") - 1) == 0) >> { >> xi->entry_point = grub_strtoull (ptr + sizeof ("VIRT_ENTRY=") - 1, &ptr, 16); >> if (grub_errno) >> - return grub_errno; >> + goto out; >> continue; >> } >> if (grub_strncmp (ptr, "HYPERCALL_PAGE=", sizeof ("HYPERCALL_PAGE=") - 1) == 0) >> @@ -138,7 +139,7 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi, >> xi->hypercall_page = grub_strtoull (ptr + sizeof ("HYPERCALL_PAGE=") - 1, &ptr, 16); >> xi->has_hypercall_page = 1; >> if (grub_errno) >> - return grub_errno; >> + goto out; >> continue; >> } >> if (grub_strncmp (ptr, "ELF_PADDR_OFFSET=", sizeof ("ELF_PADDR_OFFSET=") - 1) == 0) >> @@ -146,7 +147,7 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi, >> xi->paddr_offset = grub_strtoull (ptr + sizeof ("ELF_PADDR_OFFSET=") - 1, &ptr, 16); >> has_paddr = 1; >> if (grub_errno) >> - return grub_errno; >> + goto out; >> continue; >> } >> } >> @@ -154,7 +155,11 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi, >> xi->hypercall_page = (xi->hypercall_page << 12) + xi->virt_base; >> if (!has_paddr) >> xi->paddr_offset = xi->virt_base; >> - return GRUB_ERR_NONE; >> + >> +out: >> + grub_free (buf); >> + >> + return grub_errno; > > Are you sure that grub_errno is always set to GRUB_ERR_NONE > if any GRUB2 function finished successfully? Maybe you should > set initialize grub_errno with GRUB_ERR_NONE at the beginning > of parse_xen_guest()? Yes, probably a good idea. Juergen