dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0091-Add-support-for-linuxefi.patch

23d2ea
From cb8ffd0f744e6ed0f5ba50d5bb7c7b2795ce9a8f Mon Sep 17 00:00:00 2001
606ea6
From: Matthew Garrett <mjg@redhat.com>
606ea6
Date: Tue, 10 Jul 2012 11:58:52 -0400
23d2ea
Subject: [PATCH 091/198] Add support for linuxefi
606ea6
606ea6
---
606ea6
 grub-core/Makefile.core.def       |   8 +
606ea6
 grub-core/kern/efi/mm.c           |  32 ++++
606ea6
 grub-core/loader/i386/efi/linux.c | 371 ++++++++++++++++++++++++++++++++++++++
606ea6
 include/grub/efi/efi.h            |   3 +
606ea6
 include/grub/i386/linux.h         |   1 +
606ea6
 5 files changed, 415 insertions(+)
606ea6
 create mode 100644 grub-core/loader/i386/efi/linux.c
606ea6
606ea6
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
39700a
index 42443bc..ec46506 100644
606ea6
--- a/grub-core/Makefile.core.def
606ea6
+++ b/grub-core/Makefile.core.def
606ea6
@@ -1706,6 +1706,14 @@ module = {
606ea6
 };
606ea6
 
606ea6
 module = {
606ea6
+  name = linuxefi;
606ea6
+  efi = loader/i386/efi/linux.c;
606ea6
+  efi = lib/cmdline.c;
606ea6
+  enable = i386_efi;
606ea6
+  enable = x86_64_efi;
606ea6
+};
606ea6
+
606ea6
+module = {
606ea6
   name = chain;
606ea6
   efi = loader/efi/chainloader.c;
606ea6
   i386_pc = loader/i386/pc/chainloader.c;
606ea6
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
606ea6
index be37afd..ddeca60 100644
606ea6
--- a/grub-core/kern/efi/mm.c
606ea6
+++ b/grub-core/kern/efi/mm.c
606ea6
@@ -49,6 +49,38 @@ static grub_efi_uintn_t finish_desc_size;
606ea6
 static grub_efi_uint32_t finish_desc_version;
606ea6
 int grub_efi_is_finished = 0;
606ea6
 
606ea6
+/* Allocate pages below a specified address */
606ea6
+void *
606ea6
+grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
606ea6
+			     grub_efi_uintn_t pages)
606ea6
+{
606ea6
+  grub_efi_status_t status;
606ea6
+  grub_efi_boot_services_t *b;
606ea6
+  grub_efi_physical_address_t address = max;
606ea6
+
606ea6
+  if (max > 0xffffffff)
606ea6
+    return 0;
606ea6
+
606ea6
+  b = grub_efi_system_table->boot_services;
606ea6
+  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
606ea6
+
606ea6
+  if (status != GRUB_EFI_SUCCESS)
606ea6
+    return 0;
606ea6
+
606ea6
+  if (address == 0)
606ea6
+    {
606ea6
+      /* Uggh, the address 0 was allocated... This is too annoying,
606ea6
+	 so reallocate another one.  */
606ea6
+      address = max;
606ea6
+      status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS, GRUB_EFI_LOADER_DATA, pages, &address);
606ea6
+      grub_efi_free_pages (0, pages);
606ea6
+      if (status != GRUB_EFI_SUCCESS)
606ea6
+	return 0;
606ea6
+    }
606ea6
+
606ea6
+  return (void *) ((grub_addr_t) address);
606ea6
+}
606ea6
+
606ea6
 /* Allocate pages. Return the pointer to the first of allocated pages.  */
606ea6
 void *
606ea6
 grub_efi_allocate_pages (grub_efi_physical_address_t address,
606ea6
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
606ea6
new file mode 100644
606ea6
index 0000000..b79e632
606ea6
--- /dev/null
606ea6
+++ b/grub-core/loader/i386/efi/linux.c
606ea6
@@ -0,0 +1,371 @@
606ea6
+/*
606ea6
+ *  GRUB  --  GRand Unified Bootloader
606ea6
+ *  Copyright (C) 2012  Free Software Foundation, Inc.
606ea6
+ *
606ea6
+ *  GRUB is free software: you can redistribute it and/or modify
606ea6
+ *  it under the terms of the GNU General Public License as published by
606ea6
+ *  the Free Software Foundation, either version 3 of the License, or
606ea6
+ *  (at your option) any later version.
606ea6
+ *
606ea6
+ *  GRUB is distributed in the hope that it will be useful,
606ea6
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
606ea6
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
606ea6
+ *  GNU General Public License for more details.
606ea6
+ *
606ea6
+ *  You should have received a copy of the GNU General Public License
606ea6
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
606ea6
+ */
606ea6
+
606ea6
+#include <grub/loader.h>
606ea6
+#include <grub/file.h>
606ea6
+#include <grub/err.h>
606ea6
+#include <grub/types.h>
606ea6
+#include <grub/mm.h>
606ea6
+#include <grub/cpu/linux.h>
606ea6
+#include <grub/command.h>
606ea6
+#include <grub/i18n.h>
606ea6
+#include <grub/lib/cmdline.h>
606ea6
+#include <grub/efi/efi.h>
606ea6
+
606ea6
+GRUB_MOD_LICENSE ("GPLv3+");
606ea6
+
606ea6
+static grub_dl_t my_mod;
606ea6
+static int loaded;
606ea6
+static void *kernel_mem;
606ea6
+static grub_uint64_t kernel_size;
606ea6
+static grub_uint8_t *initrd_mem;
606ea6
+static grub_uint32_t handover_offset;
606ea6
+struct linux_kernel_params *params;
606ea6
+static char *linux_cmdline;
606ea6
+
606ea6
+#define BYTES_TO_PAGES(bytes)   (((bytes) + 0xfff) >> 12)
606ea6
+
606ea6
+#define SHIM_LOCK_GUID \
606ea6
+  { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
606ea6
+
606ea6
+struct grub_efi_shim_lock
606ea6
+{
606ea6
+  grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size);
606ea6
+};
606ea6
+typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
606ea6
+
606ea6
+static grub_efi_boolean_t
606ea6
+grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
606ea6
+{
606ea6
+  grub_efi_guid_t guid = SHIM_LOCK_GUID;
606ea6
+  grub_efi_shim_lock_t *shim_lock;
606ea6
+
606ea6
+  shim_lock = grub_efi_locate_protocol(&guid, NULL);
606ea6
+
606ea6
+  if (!shim_lock)
606ea6
+    return 1;
606ea6
+
606ea6
+  if (shim_lock->verify(data, size) == GRUB_EFI_SUCCESS)
606ea6
+    return 1;
606ea6
+
606ea6
+  return 0;
606ea6
+}
606ea6
+
606ea6
+typedef void(*handover_func)(void *, grub_efi_system_table_t *, struct linux_kernel_params *);
606ea6
+
606ea6
+static grub_err_t
606ea6
+grub_linuxefi_boot (void)
606ea6
+{
606ea6
+  handover_func hf;
606ea6
+  int offset = 0;
606ea6
+
606ea6
+#ifdef __x86_64__
606ea6
+  offset = 512;
606ea6
+#endif
606ea6
+
606ea6
+  hf = (handover_func)((char *)kernel_mem + handover_offset + offset);
606ea6
+
606ea6
+  asm volatile ("cli");
606ea6
+
606ea6
+  hf (grub_efi_image_handle, grub_efi_system_table, params);
606ea6
+
606ea6
+  /* Not reached */
606ea6
+  return GRUB_ERR_NONE;
606ea6
+}
606ea6
+
606ea6
+static grub_err_t
606ea6
+grub_linuxefi_unload (void)
606ea6
+{
606ea6
+  grub_dl_unref (my_mod);
606ea6
+  loaded = 0;
606ea6
+  if (initrd_mem)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size));
606ea6
+  if (linux_cmdline)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1));
606ea6
+  if (kernel_mem)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
606ea6
+  if (params)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
606ea6
+  return GRUB_ERR_NONE;
606ea6
+}
606ea6
+
606ea6
+static grub_err_t
606ea6
+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
606ea6
+                 int argc, char *argv[])
606ea6
+{
606ea6
+  grub_file_t *files = 0;
606ea6
+  int i, nfiles = 0;
606ea6
+  grub_size_t size = 0;
606ea6
+  grub_uint8_t *ptr;
606ea6
+
606ea6
+  if (argc == 0)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (!loaded)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("you need to load the kernel first"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  files = grub_zalloc (argc * sizeof (files[0]));
606ea6
+  if (!files)
606ea6
+    goto fail;
606ea6
+
606ea6
+  for (i = 0; i < argc; i++)
606ea6
+    {
606ea6
+      grub_file_filter_disable_compression ();
606ea6
+      files[i] = grub_file_open (argv[i]);
606ea6
+      if (! files[i])
606ea6
+        goto fail;
606ea6
+      nfiles++;
606ea6
+      size += ALIGN_UP (grub_file_size (files[i]), 4);
606ea6
+    }
606ea6
+
606ea6
+  initrd_mem = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(size));
606ea6
+
606ea6
+  if (!initrd_mem)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate initrd"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  params->ramdisk_size = size;
606ea6
+  params->ramdisk_image = (grub_uint32_t)(grub_uint64_t) initrd_mem;
606ea6
+
606ea6
+  ptr = initrd_mem;
606ea6
+
606ea6
+  for (i = 0; i < nfiles; i++)
606ea6
+    {
606ea6
+      grub_ssize_t cursize = grub_file_size (files[i]);
606ea6
+      if (grub_file_read (files[i], ptr, cursize) != cursize)
606ea6
+        {
606ea6
+          if (!grub_errno)
606ea6
+            grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
606ea6
+                        argv[i]);
606ea6
+          goto fail;
606ea6
+        }
606ea6
+      ptr += cursize;
606ea6
+      grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
606ea6
+      ptr += ALIGN_UP_OVERHEAD (cursize, 4);
606ea6
+    }
606ea6
+
606ea6
+  params->ramdisk_size = size;
606ea6
+
606ea6
+ fail:
606ea6
+  for (i = 0; i < nfiles; i++)
606ea6
+    grub_file_close (files[i]);
606ea6
+  grub_free (files);
606ea6
+
606ea6
+  if (initrd_mem && grub_errno)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(size));
606ea6
+
606ea6
+  return grub_errno;
606ea6
+}
606ea6
+
606ea6
+static grub_err_t
606ea6
+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
606ea6
+		int argc, char *argv[])
606ea6
+{
606ea6
+  grub_file_t file = 0;
606ea6
+  struct linux_kernel_header lh;
606ea6
+  grub_ssize_t len, start, filelen;
606ea6
+  void *kernel;
606ea6
+
606ea6
+  grub_dl_ref (my_mod);
606ea6
+
606ea6
+  if (argc == 0)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  file = grub_file_open (argv[0]);
606ea6
+  if (! file)
606ea6
+    goto fail;
606ea6
+
606ea6
+  filelen = grub_file_size (file);
606ea6
+
606ea6
+  kernel = grub_malloc(filelen);
606ea6
+
606ea6
+  if (!kernel)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (grub_file_read (file, kernel, filelen) != filelen)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"), argv[0]);
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (! grub_linuxefi_secure_validate (kernel, filelen))
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
606ea6
+      grub_free (kernel);
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  grub_file_seek (file, 0);
606ea6
+
606ea6
+  grub_free(kernel);
606ea6
+
606ea6
+  params = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(16384));
606ea6
+
606ea6
+  if (! params)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  memset (params, 0, 16384);
606ea6
+
606ea6
+  if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
606ea6
+    {
606ea6
+      if (!grub_errno)
606ea6
+	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
606ea6
+		    argv[0]);
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("invalid magic number"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("too many setup sectors"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (lh.version < grub_cpu_to_le16 (0x020b))
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("kernel too old"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (!lh.handover_offset)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("kernel doesn't support EFI handover"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
606ea6
+					 BYTES_TO_PAGES(lh.cmdline_size + 1));
606ea6
+
606ea6
+  if (!linux_cmdline)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
606ea6
+  grub_create_loader_cmdline (argc, argv,
606ea6
+                              linux_cmdline + sizeof (LINUX_IMAGE) - 1,
606ea6
+			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
606ea6
+
606ea6
+  lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline;
606ea6
+
606ea6
+  handover_offset = lh.handover_offset;
606ea6
+
606ea6
+  start = (lh.setup_sects + 1) * 512;
606ea6
+  len = grub_file_size(file) - start;
606ea6
+
606ea6
+  kernel_mem = grub_efi_allocate_pages(lh.pref_address,
606ea6
+				       BYTES_TO_PAGES(lh.init_size));
606ea6
+
606ea6
+  if (!kernel_mem)
606ea6
+    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
606ea6
+					     BYTES_TO_PAGES(lh.init_size));
606ea6
+
606ea6
+  if (!kernel_mem)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (grub_file_seek (file, start) == (grub_off_t) -1)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
606ea6
+		  argv[0]);
606ea6
+      goto fail;
606ea6
+    }
606ea6
+
606ea6
+  if (grub_file_read (file, kernel_mem, len) != len && !grub_errno)
606ea6
+    {
606ea6
+      grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
606ea6
+		  argv[0]);
606ea6
+    }
606ea6
+
606ea6
+  if (grub_errno == GRUB_ERR_NONE)
606ea6
+    {
606ea6
+      grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
606ea6
+      loaded = 1;
606ea6
+      lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
606ea6
+    }
606ea6
+
606ea6
+  memcpy(params, &lh, 2 * 512);
606ea6
+
606ea6
+  params->type_of_loader = 0x21;
606ea6
+
606ea6
+ fail:
606ea6
+
606ea6
+  if (file)
606ea6
+    grub_file_close (file);
606ea6
+
606ea6
+  if (grub_errno != GRUB_ERR_NONE)
606ea6
+    {
606ea6
+      grub_dl_unref (my_mod);
606ea6
+      loaded = 0;
606ea6
+    }
606ea6
+
606ea6
+  if (linux_cmdline && !loaded)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1));
606ea6
+
606ea6
+  if (kernel_mem && !loaded)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
606ea6
+
606ea6
+  if (params && !loaded)
606ea6
+    grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
606ea6
+
606ea6
+  return grub_errno;
606ea6
+}
606ea6
+
606ea6
+static grub_command_t cmd_linux, cmd_initrd;
606ea6
+
606ea6
+GRUB_MOD_INIT(linuxefi)
606ea6
+{
606ea6
+  cmd_linux =
606ea6
+    grub_register_command ("linuxefi", grub_cmd_linux,
606ea6
+                           0, N_("Load Linux."));
606ea6
+  cmd_initrd =
606ea6
+    grub_register_command ("initrdefi", grub_cmd_initrd,
606ea6
+                           0, N_("Load initrd."));
606ea6
+  my_mod = mod;
606ea6
+}
606ea6
+
606ea6
+GRUB_MOD_FINI(linuxefi)
606ea6
+{
606ea6
+  grub_unregister_command (cmd_linux);
606ea6
+  grub_unregister_command (cmd_initrd);
606ea6
+}
606ea6
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
606ea6
index 489cf9e..9370fd5 100644
606ea6
--- a/include/grub/efi/efi.h
606ea6
+++ b/include/grub/efi/efi.h
606ea6
@@ -40,6 +40,9 @@ void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
606ea6
 void *
606ea6
 EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
606ea6
 				      grub_efi_uintn_t pages);
606ea6
+void *
606ea6
+EXPORT_FUNC(grub_efi_allocate_pages_max) (grub_efi_physical_address_t max,
606ea6
+					  grub_efi_uintn_t pages);
606ea6
 void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
606ea6
 				       grub_efi_uintn_t pages);
606ea6
 int
606ea6
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
606ea6
index da0ca3b..fc36bda 100644
606ea6
--- a/include/grub/i386/linux.h
606ea6
+++ b/include/grub/i386/linux.h
606ea6
@@ -139,6 +139,7 @@ struct linux_kernel_header
606ea6
   grub_uint64_t setup_data;
606ea6
   grub_uint64_t pref_address;
606ea6
   grub_uint32_t init_size;
606ea6
+  grub_uint32_t handover_offset;
606ea6
 } GRUB_PACKED;
606ea6
 
606ea6
 /* Boot parameters for Linux based on 2.6.12. This is used by the setup
606ea6
-- 
23d2ea
2.7.4
606ea6