forked from pool/grub2
8da1cb3353
- From Juergen Gross <jgross@suse.com>: grub-xen: support booting huge pv-domains (bsc#1004398) (bsc#899465) * 0001-xen-make-xen-loader-callable-multiple-times.patch * 0002-xen-avoid-memleaks-on-error.patch * 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch * 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch * 0005-xen-synchronize-xen-header.patch * 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch * 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch * 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch * 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch * 0010-xen-modify-page-table-construction.patch * 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch OBS-URL: https://build.opensuse.org/request/show/436663 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=236
84 lines
2.0 KiB
Diff
84 lines
2.0 KiB
Diff
From 3fcf47254678ddd9387b8ee80f21ad5f163cb7a9 Mon Sep 17 00:00:00 2001
|
|
From: Juergen Gross <jgross@suse.com>
|
|
Date: Thu, 3 Mar 2016 10:38:06 +0100
|
|
Subject: [PATCH 01/11] xen: make xen loader callable multiple times
|
|
|
|
The loader for xen paravirtualized environment isn't callable multiple
|
|
times as it won't free any memory in case of failure.
|
|
|
|
Call grub_relocator_unload() as other modules do it before allocating
|
|
a new relocator or when unloading the module.
|
|
|
|
Signed-off-by: Juergen Gross <jgross@suse.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/loader/i386/xen.c | 27 +++++++++++++++++++--------
|
|
1 file changed, 19 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
|
|
index c4d9689..179e89c 100644
|
|
--- a/grub-core/loader/i386/xen.c
|
|
+++ b/grub-core/loader/i386/xen.c
|
|
@@ -316,11 +316,23 @@ grub_xen_boot (void)
|
|
xen_inf.virt_base);
|
|
}
|
|
|
|
+static void
|
|
+grub_xen_reset (void)
|
|
+{
|
|
+ grub_memset (&next_start, 0, sizeof (next_start));
|
|
+ xen_module_info_page = NULL;
|
|
+ n_modules = 0;
|
|
+
|
|
+ grub_relocator_unload (relocator);
|
|
+ relocator = NULL;
|
|
+ loaded = 0;
|
|
+}
|
|
+
|
|
static grub_err_t
|
|
grub_xen_unload (void)
|
|
{
|
|
+ grub_xen_reset ();
|
|
grub_dl_unref (my_mod);
|
|
- loaded = 0;
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
@@ -403,10 +415,7 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
grub_loader_unset ();
|
|
|
|
- grub_memset (&next_start, 0, sizeof (next_start));
|
|
-
|
|
- xen_module_info_page = NULL;
|
|
- n_modules = 0;
|
|
+ grub_xen_reset ();
|
|
|
|
grub_create_loader_cmdline (argc - 1, argv + 1,
|
|
(char *) next_start.cmd_line,
|
|
@@ -503,16 +512,18 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
|
|
goto fail;
|
|
|
|
fail:
|
|
+ /* grub_errno might be clobbered by further calls, save the error reason. */
|
|
+ err = grub_errno;
|
|
|
|
if (elf)
|
|
grub_elf_close (elf);
|
|
else if (file)
|
|
grub_file_close (file);
|
|
|
|
- if (grub_errno != GRUB_ERR_NONE)
|
|
- loaded = 0;
|
|
+ if (err != GRUB_ERR_NONE)
|
|
+ grub_xen_reset ();
|
|
|
|
- return grub_errno;
|
|
+ return err;
|
|
}
|
|
|
|
static grub_err_t
|
|
--
|
|
2.6.6
|
|
|