* grub-core/loader/i386/linux.c (allocate_pages): Allocate at least

	a page in protected space.

diff --git a/ChangeLog b/ChangeLog
index 7319fb8cf964bb128be904a44a996b7cc78afc87..f2e8dd9ab1f5d5130b6b0481246071deb57ff066 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/linux.c (allocate_pages): Allocate at least
+       a page in protected space.
+
 2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/multiboot.c (grub_cmd_module): Don't attempt to

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 18b7b0fa1286df783e326657aae9c553c451eceb..7b63e257994171fde5cec03345fc3ceed4bd2a10 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -198,6 +198,9 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
 {
   grub_err_t err;
 
+  if (prot_size == 0)
+    prot_size = 1;
+
   prot_size = page_align (prot_size);
 
   /* Initialize the memory pointers with NULL for convenience.  */