[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 02/11] xen: avoid memleaks on error
From: |
Juergen Gross |
Subject: |
[PATCH v7 02/11] xen: avoid memleaks on error |
Date: |
Thu, 3 Mar 2016 10:38:07 +0100 |
When loading a Xen pv-kernel avoid memory leaks in case of errors.
Signed-off-by: Juergen Gross <address@hidden>
Reviewed-by: Daniel Kiper <address@hidden>
---
V5: set grub_errno to GRUB_ERR_NONE to avoid false error reports as requested
by Daniel Kiper
---
grub-core/loader/i386/xen.c | 2 +-
grub-core/loader/i386/xen_fileXX.c | 19 +++++++++++++------
2 files changed, 14 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..36b40e4 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -26,6 +26,8 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info
*xi,
char *buf;
char *ptr;
int has_paddr = 0;
+
+ grub_errno = GRUB_ERR_NONE;
if (grub_file_seek (elf->file, off) == (grub_off_t) -1)
return grub_errno;
buf = grub_malloc (sz);
@@ -35,7 +37,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 +126,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 +141,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 +149,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 +157,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;
}
#pragma GCC diagnostic ignored "-Wcast-align"
--
2.6.2
- [PATCH v7 00/11] grub-xen: support booting huge pv-domains, Juergen Gross, 2016/03/03
- [PATCH v7 01/11] xen: make xen loader callable multiple times, Juergen Gross, 2016/03/03
- [PATCH v7 09/11] xen: add capability to load initrd outside of initial mapping, Juergen Gross, 2016/03/03
- [PATCH v7 06/11] xen: factor out p2m list allocation into separate function, Juergen Gross, 2016/03/03
- [PATCH v7 04/11] xen: add elfnote.h to avoid using numbers instead of constants, Juergen Gross, 2016/03/03
- [PATCH v7 07/11] xen: factor out allocation of special pages into separate function, Juergen Gross, 2016/03/03
- [PATCH v7 11/11] xen: add capability to load p2m list outside of kernel mapping, Juergen Gross, 2016/03/03
- [PATCH v7 05/11] xen: synchronize xen header, Juergen Gross, 2016/03/03
- [PATCH v7 02/11] xen: avoid memleaks on error,
Juergen Gross <=
- [PATCH v7 03/11] xen: reduce number of global variables in xen loader, Juergen Gross, 2016/03/03
- [PATCH v7 08/11] xen: factor out allocation of page tables into separate function, Juergen Gross, 2016/03/03
- [PATCH v7 10/11] xen: modify page table construction, Juergen Gross, 2016/03/03
- Re: [PATCH v7 00/11] grub-xen: support booting huge pv-domains, Daniel Kiper, 2016/03/03
- Re: [PATCH v7 00/11] grub-xen: support booting huge pv-domains, Juergen Gross, 2016/03/29