Blame SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: Raymund Will <rw@suse.com>
8631a2
Date: Fri, 10 Apr 2015 01:45:02 -0400
8631a2
Subject: [PATCH] Add secureboot support on efi chainloader
8631a2
8631a2
Expand the chainloader to be able to verify the image by means of shim
8631a2
lock protocol. The PE/COFF image is loaded and relocated by the
8631a2
chainloader instead of calling LoadImage and StartImage UEFI boot
8631a2
Service as they require positive verification result from keys enrolled
8631a2
in KEK or DB. The shim will use MOK in addition to firmware enrolled
8631a2
keys to verify the image.
8631a2
8631a2
The chainloader module could be used to load other UEFI bootloaders,
8631a2
such as xen.efi, and could be signed by any of MOK, KEK or DB.
8631a2
8631a2
Based on https://build.opensuse.org/package/view_file/openSUSE:Factory/grub2/grub2-secureboot-chainloader.patch
8631a2
8631a2
Signed-off-by: Peter Jones <pjones@redhat.com>
8631a2
8631a2
Also:
8631a2
8631a2
commit cd7a8984d4fda905877b5bfe466339100156b3bc
8631a2
Author: Raymund Will <rw@suse.com>
8631a2
Date:   Fri Apr 10 01:45:02 2015 -0400
8631a2
8631a2
Use device part of chainloader target, if present.
8631a2
8631a2
Otherwise chainloading is restricted to '$root', which might not even
8631a2
be readable by EFI!
8631a2
8631a2
v1. use grub_file_get_device_name() to get device name
8631a2
8631a2
Signed-off-by: Michael Chang <mchang@suse.com>
8631a2
Signed-off-by: Peter Jones <pjones@redhat.com>
8631a2
8631a2
Also:
8631a2
8631a2
commit 0872a2310a0eeac4ecfe9e1b49dd2d72ab373039
8631a2
Author: Peter Jones <pjones@redhat.com>
8631a2
Date:   Fri Jun 10 14:06:15 2016 -0400
8631a2
8631a2
Rework even more of efi chainload so non-sb cases work right.
8631a2
8631a2
This ensures that if shim protocol is not loaded, or is loaded but shim
8631a2
is disabled, we will fall back to a correct load method for the efi
8631a2
chain loader.
8631a2
8631a2
Here's what I tested with this version:
8631a2
8631a2
results                             expected    actual
8631a2
------------------------------------------------------------
8631a2
sb + enabled + shim + fedora        success     success
8631a2
sb + enabled + shim + win           success     success
8631a2
sb + enabled + grub + fedora        fail        fail
8631a2
sb + enabled + grub + win           fail        fail
8631a2
8631a2
sb + mokdisabled + shim + fedora    success     success
8631a2
sb + mokdisabled + shim + win       success     success
8631a2
sb + mokdisabled + grub + fedora    fail        fail
8631a2
sb + mokdisabled + grub + win       fail        fail
8631a2
8631a2
sb disabled + shim + fedora         success     success*
8631a2
sb disabled + shim + win            success     success*
8631a2
sb disabled + grub + fedora         success     success
8631a2
sb disabled + grub + win            success     success
8631a2
8631a2
nosb + shim + fedora                success     success*
8631a2
nosb + shim + win                   success     success*
8631a2
nosb + grub + fedora                success     success
8631a2
nosb + grub + win                   success     success
8631a2
8631a2
* for some reason shim protocol is being installed in these cases, and I
8631a2
  can't see why, but I think it may be this firmware build returning an
8631a2
  erroneous value.  But this effectively falls back to the mokdisabled
8631a2
  behavior, which works correctly, and the presence of the "grub" (i.e.
8631a2
  no shim) tests effectively tests the desired behavior here.
8631a2
8631a2
Resolves: rhbz#1344512
8631a2
8631a2
Signed-off-by: Peter Jones <pjones@redhat.com>
8631a2
8631a2
Also:
8631a2
8631a2
commit ff7b1cb7f69487870211aeb69ff4f54470fbcb58
8631a2
Author: Laszlo Ersek <lersek@redhat.com>
8631a2
Date:   Mon Nov 21 15:34:00 2016 +0100
8631a2
8631a2
efi/chainloader: fix wrong sanity check in relocate_coff()
8631a2
8631a2
In relocate_coff(), the relocation entries are parsed from the original
8631a2
image (not the section-wise copied image). The original image is
8631a2
pointed-to by the "orig" pointer. The current check
8631a2
8631a2
  (void *)reloc_end < data
8631a2
8631a2
compares the addresses of independent memory allocations. "data" is a typo
8631a2
here, it should be "orig".
8631a2
8631a2
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
8631a2
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
8631a2
Tested-by: Bogdan Costescu <bcostescu@gmail.com>
8631a2
Tested-by: Juan Orti <j.orti.alcaine@gmail.com>
8631a2
8631a2
Also:
8631a2
8631a2
commit ab4ba9997ad4832449e54d930fa2aac6a160d0e9
8631a2
Author: Laszlo Ersek <lersek@redhat.com>
8631a2
Date:   Wed Nov 23 06:27:09 2016 +0100
8631a2
8631a2
efi/chainloader: truncate overlong relocation section
8631a2
8631a2
The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1
8631a2
31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers.
8631a2
8631a2
Compare:
8631a2
8631a2
> The Data Directory
8631a2
> ...
8631a2
> Entry 5 00000000000d9000 00000574 Base Relocation Directory [.reloc]
8631a2
8631a2
Versus:
8631a2
8631a2
> Sections:
8631a2
> Idx Name      Size      VMA               LMA               File off ...
8631a2
> ...
8631a2
>  10 .reloc    00000e22  00000000100d9000  00000000100d9000  000a1800 ...
8631a2
8631a2
That is, the size reported by the RelocDir entry (0x574) is smaller than
8631a2
the virtual size of the .reloc section (0xe22).
8631a2
8631a2
Quoting the grub2 debug log for the same:
8631a2
8631a2
> chainloader.c:595: reloc_dir: 0xd9000 reloc_size: 0x00000574
8631a2
> chainloader.c:603: reloc_base: 0x7d208000 reloc_base_end: 0x7d208573
8631a2
> ...
8631a2
> chainloader.c:620: Section 10 ".reloc" at 0x7d208000..0x7d208e21
8631a2
> chainloader.c:661:  section is not reloc section?
8631a2
> chainloader.c:663:  rds: 0x00001000, vs: 00000e22
8631a2
> chainloader.c:664:  base: 0x7d208000 end: 0x7d208e21
8631a2
> chainloader.c:666:  reloc_base: 0x7d208000 reloc_base_end: 0x7d208573
8631a2
> chainloader.c:671:  Section characteristics are 42000040
8631a2
> chainloader.c:673:  Section virtual size: 00000e22
8631a2
> chainloader.c:675:  Section raw_data size: 00001000
8631a2
> chainloader.c:678:  Discarding section
8631a2
8631a2
After hexdumping "bootmgfw.efi" and manually walking its relocation blocks
8631a2
(yes, really), I determined that the (smaller) RelocDir value is correct.
8631a2
The remaining area that extends up to the .reloc section size (== 0xe22 -
8631a2
0x574 == 0x8ae bytes) exists as zero padding in the file.
8631a2
8631a2
This zero padding shouldn't be passed to relocate_coff() for parsing. In
8631a2
order to cope with it, split the handling of .reloc sections into the
8631a2
following branches:
8631a2
8631a2
- original case (equal size): original behavior (--> relocation
8631a2
  attempted),
8631a2
8631a2
- overlong .reloc section (longer than reported by RelocDir): truncate the
8631a2
  section to the RelocDir size for the purposes of relocate_coff(), and
8631a2
  attempt relocation,
8631a2
8631a2
- .reloc section is too short, or other checks fail: original behavior
8631a2
  (--> relocation not attempted).
8631a2
8631a2
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
8631a2
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
8631a2
---
8631a2
 grub-core/kern/efi/efi.c           |  14 +-
8631a2
 grub-core/loader/arm64/linux.c     |   4 +-
8631a2
 grub-core/loader/efi/chainloader.c | 817 +++++++++++++++++++++++++++++++++----
8631a2
 grub-core/loader/efi/linux.c       |  25 +-
8631a2
 grub-core/loader/i386/efi/linux.c  |  17 +-
8631a2
 include/grub/efi/linux.h           |   2 +-
8631a2
 include/grub/efi/pe32.h            |  52 ++-
8631a2
 7 files changed, 840 insertions(+), 91 deletions(-)
8631a2
8631a2
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
b32e65
index c8a9d8307..91129e335 100644
8631a2
--- a/grub-core/kern/efi/efi.c
8631a2
+++ b/grub-core/kern/efi/efi.c
8631a2
@@ -283,14 +283,20 @@ grub_efi_secure_boot (void)
8631a2
   grub_efi_boolean_t ret = 0;
8631a2
 
8631a2
   secure_boot = grub_efi_get_variable("SecureBoot", &efi_var_guid, &datasize);
8631a2
-
8631a2
   if (datasize != 1 || !secure_boot)
8631a2
-    goto out;
8631a2
+    {
8631a2
+      grub_dprintf ("secureboot", "No SecureBoot variable\n");
8631a2
+      goto out;
8631a2
+    }
8631a2
+  grub_dprintf ("secureboot", "SecureBoot: %d\n", *secure_boot);
8631a2
 
8631a2
   setup_mode = grub_efi_get_variable("SetupMode", &efi_var_guid, &datasize);
8631a2
-
8631a2
   if (datasize != 1 || !setup_mode)
8631a2
-    goto out;
8631a2
+    {
8631a2
+      grub_dprintf ("secureboot", "No SetupMode variable\n");
8631a2
+      goto out;
8631a2
+    }
8631a2
+  grub_dprintf ("secureboot", "SetupMode: %d\n", *setup_mode);
8631a2
 
8631a2
   if (*secure_boot && !*setup_mode)
8631a2
     ret = 1;
8631a2
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
b32e65
index 6c00af98d..a1ac7a388 100644
8631a2
--- a/grub-core/loader/arm64/linux.c
8631a2
+++ b/grub-core/loader/arm64/linux.c
8631a2
@@ -282,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
   grub_file_t file = 0;
8631a2
   struct linux_armxx_kernel_header lh;
8631a2
   struct grub_armxx_linux_pe_header *pe;
8631a2
+  int rc;
8631a2
 
8631a2
   grub_dl_ref (my_mod);
8631a2
 
8631a2
@@ -326,7 +327,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
 
8631a2
   grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);
8631a2
 
8631a2
-  if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size))
8631a2
+  rc = grub_linuxefi_secure_validate (kernel_addr, kernel_size);
8631a2
+  if (rc < 0)
8631a2
     {
8631a2
       grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
8631a2
       goto fail;
8631a2
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
b32e65
index adc856366..af2189619 100644
8631a2
--- a/grub-core/loader/efi/chainloader.c
8631a2
+++ b/grub-core/loader/efi/chainloader.c
8631a2
@@ -32,6 +32,8 @@
8631a2
 #include <grub/efi/api.h>
8631a2
 #include <grub/efi/efi.h>
8631a2
 #include <grub/efi/disk.h>
8631a2
+#include <grub/efi/pe32.h>
8631a2
+#include <grub/efi/linux.h>
8631a2
 #include <grub/command.h>
8631a2
 #include <grub/i18n.h>
8631a2
 #include <grub/net.h>
8631a2
@@ -46,9 +48,14 @@ static grub_dl_t my_mod;
8631a2
 
8631a2
 static grub_efi_physical_address_t address;
8631a2
 static grub_efi_uintn_t pages;
8631a2
+static grub_ssize_t fsize;
8631a2
 static grub_efi_device_path_t *file_path;
8631a2
 static grub_efi_handle_t image_handle;
8631a2
 static grub_efi_char16_t *cmdline;
8631a2
+static grub_ssize_t cmdline_len;
8631a2
+static grub_efi_handle_t dev_handle;
8631a2
+
8631a2
+static grub_efi_status_t (*entry_point) (grub_efi_handle_t image_handle, grub_efi_system_table_t *system_table);
8631a2
 
8631a2
 static grub_err_t
8631a2
 grub_chainloader_unload (void)
8631a2
@@ -63,6 +70,7 @@ grub_chainloader_unload (void)
8631a2
   grub_free (cmdline);
8631a2
   cmdline = 0;
8631a2
   file_path = 0;
8631a2
+  dev_handle = 0;
8631a2
 
8631a2
   grub_dl_unref (my_mod);
8631a2
   return GRUB_ERR_NONE;
8631a2
@@ -173,7 +181,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
8631a2
   /* Fill the file path for the directory.  */
8631a2
   d = (grub_efi_device_path_t *) ((char *) file_path
8631a2
 				  + ((char *) d - (char *) dp));
8631a2
-  grub_efi_print_device_path (d);
8631a2
   copy_file_path ((grub_efi_file_path_device_path_t *) d,
8631a2
 		  dir_start, dir_end - dir_start);
8631a2
 
8631a2
@@ -191,20 +198,690 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
8631a2
   return file_path;
8631a2
 }
8631a2
 
8631a2
+#define SHIM_LOCK_GUID \
8631a2
+  { 0x605dab50, 0xe046, 0x4300, { 0xab,0xb6,0x3d,0xd8,0x10,0xdd,0x8b,0x23 } }
8631a2
+
8631a2
+typedef union
8631a2
+{
8631a2
+  struct grub_pe32_header_32 pe32;
8631a2
+  struct grub_pe32_header_64 pe32plus;
8631a2
+} grub_pe_header_t;
8631a2
+
8631a2
+struct pe_coff_loader_image_context
8631a2
+{
8631a2
+  grub_efi_uint64_t image_address;
8631a2
+  grub_efi_uint64_t image_size;
8631a2
+  grub_efi_uint64_t entry_point;
8631a2
+  grub_efi_uintn_t size_of_headers;
8631a2
+  grub_efi_uint16_t image_type;
8631a2
+  grub_efi_uint16_t number_of_sections;
8631a2
+  grub_efi_uint32_t section_alignment;
8631a2
+  struct grub_pe32_section_table *first_section;
8631a2
+  struct grub_pe32_data_directory *reloc_dir;
8631a2
+  struct grub_pe32_data_directory *sec_dir;
8631a2
+  grub_efi_uint64_t number_of_rva_and_sizes;
8631a2
+  grub_pe_header_t *pe_hdr;
8631a2
+};
8631a2
+
8631a2
+typedef struct pe_coff_loader_image_context pe_coff_loader_image_context_t;
8631a2
+
8631a2
+struct grub_efi_shim_lock
8631a2
+{
8631a2
+  grub_efi_status_t (*verify)(void *buffer,
8631a2
+                              grub_efi_uint32_t size);
8631a2
+  grub_efi_status_t (*hash)(void *data,
8631a2
+                            grub_efi_int32_t datasize,
8631a2
+                            pe_coff_loader_image_context_t *context,
8631a2
+                            grub_efi_uint8_t *sha256hash,
8631a2
+                            grub_efi_uint8_t *sha1hash);
8631a2
+  grub_efi_status_t (*context)(void *data,
8631a2
+                               grub_efi_uint32_t size,
8631a2
+                               pe_coff_loader_image_context_t *context);
8631a2
+};
8631a2
+
8631a2
+typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
8631a2
+
8631a2
+static grub_efi_boolean_t
8631a2
+read_header (void *data, grub_efi_uint32_t size,
8631a2
+	     pe_coff_loader_image_context_t *context)
8631a2
+{
8631a2
+  grub_efi_guid_t guid = SHIM_LOCK_GUID;
8631a2
+  grub_efi_shim_lock_t *shim_lock;
8631a2
+  grub_efi_status_t status;
8631a2
+
8631a2
+  shim_lock = grub_efi_locate_protocol (&guid, NULL);
8631a2
+  if (!shim_lock)
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "no shim lock protocol");
8631a2
+      return 0;
8631a2
+    }
8631a2
+
8631a2
+  status = shim_lock->context (data, size, context);
8631a2
+
8631a2
+  if (status == GRUB_EFI_SUCCESS)
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "context success\n");
8631a2
+      return 1;
8631a2
+    }
8631a2
+
8631a2
+  switch (status)
8631a2
+    {
8631a2
+      case GRUB_EFI_UNSUPPORTED:
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "context error unsupported");
8631a2
+      break;
8631a2
+      case GRUB_EFI_INVALID_PARAMETER:
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "context error invalid parameter");
8631a2
+      break;
8631a2
+      default:
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "context error code");
8631a2
+      break;
8631a2
+    }
8631a2
+
8631a2
+  return -1;
8631a2
+}
8631a2
+
8631a2
+static void*
8631a2
+image_address (void *image, grub_efi_uint64_t sz, grub_efi_uint64_t adr)
8631a2
+{
8631a2
+  if (adr > sz)
8631a2
+    return NULL;
8631a2
+
8631a2
+  return ((grub_uint8_t*)image + adr);
8631a2
+}
8631a2
+
8631a2
+static int
8631a2
+image_is_64_bit (grub_pe_header_t *pe_hdr)
8631a2
+{
8631a2
+  /* .Magic is the same offset in all cases */
8631a2
+  if (pe_hdr->pe32plus.optional_header.magic == GRUB_PE32_PE64_MAGIC)
8631a2
+    return 1;
8631a2
+  return 0;
8631a2
+}
8631a2
+
8631a2
+static const grub_uint16_t machine_type __attribute__((__unused__)) =
8631a2
+#if defined(__x86_64__)
8631a2
+  GRUB_PE32_MACHINE_X86_64;
8631a2
+#elif defined(__aarch64__)
8631a2
+  GRUB_PE32_MACHINE_ARM64;
8631a2
+#elif defined(__arm__)
8631a2
+  GRUB_PE32_MACHINE_ARMTHUMB_MIXED;
8631a2
+#elif defined(__i386__) || defined(__i486__) || defined(__i686__)
8631a2
+  GRUB_PE32_MACHINE_I386;
8631a2
+#elif defined(__ia64__)
8631a2
+  GRUB_PE32_MACHINE_IA64;
8631a2
+#else
8631a2
+#error this architecture is not supported by grub2
8631a2
+#endif
8631a2
+
8631a2
+static grub_efi_status_t
8631a2
+relocate_coff (pe_coff_loader_image_context_t *context,
8631a2
+	       struct grub_pe32_section_table *section,
8631a2
+	       void *orig, void *data)
8631a2
+{
8631a2
+  struct grub_pe32_data_directory *reloc_base, *reloc_base_end;
8631a2
+  grub_efi_uint64_t adjust;
8631a2
+  struct grub_pe32_fixup_block *reloc, *reloc_end;
8631a2
+  char *fixup, *fixup_base, *fixup_data = NULL;
8631a2
+  grub_efi_uint16_t *fixup_16;
8631a2
+  grub_efi_uint32_t *fixup_32;
8631a2
+  grub_efi_uint64_t *fixup_64;
8631a2
+  grub_efi_uint64_t size = context->image_size;
8631a2
+  void *image_end = (char *)orig + size;
8631a2
+  int n = 0;
8631a2
+
8631a2
+  if (image_is_64_bit (context->pe_hdr))
8631a2
+    context->pe_hdr->pe32plus.optional_header.image_base =
8631a2
+      (grub_uint64_t)(unsigned long)data;
8631a2
+  else
8631a2
+    context->pe_hdr->pe32.optional_header.image_base =
8631a2
+      (grub_uint32_t)(unsigned long)data;
8631a2
+
8631a2
+  /* Alright, so here's how this works:
8631a2
+   *
8631a2
+   * context->reloc_dir gives us two things:
8631a2
+   * - the VA the table of base relocation blocks are (maybe) to be
8631a2
+   *   mapped at (reloc_dir->rva)
8631a2
+   * - the virtual size (reloc_dir->size)
8631a2
+   *
8631a2
+   * The .reloc section (section here) gives us some other things:
8631a2
+   * - the name! kind of. (section->name)
8631a2
+   * - the virtual size (section->virtual_size), which should be the same
8631a2
+   *   as RelocDir->Size
8631a2
+   * - the virtual address (section->virtual_address)
8631a2
+   * - the file section size (section->raw_data_size), which is
8631a2
+   *   a multiple of optional_header->file_alignment.  Only useful for image
8631a2
+   *   validation, not really useful for iteration bounds.
8631a2
+   * - the file address (section->raw_data_offset)
8631a2
+   * - a bunch of stuff we don't use that's 0 in our binaries usually
8631a2
+   * - Flags (section->characteristics)
8631a2
+   *
8631a2
+   * and then the thing that's actually at the file address is an array
8631a2
+   * of struct grub_pe32_fixup_block structs with some values packed behind
8631a2
+   * them.  The block_size field of this structure includes the
8631a2
+   * structure itself, and adding it to that structure's address will
8631a2
+   * yield the next entry in the array.
8631a2
+   */
8631a2
+
8631a2
+  reloc_base = image_address (orig, size, section->raw_data_offset);
8631a2
+  reloc_base_end = image_address (orig, size, section->raw_data_offset
8631a2
+				  + section->virtual_size);
8631a2
+
8631a2
+  grub_dprintf ("chain", "relocate_coff(): reloc_base %p reloc_base_end %p\n",
8631a2
+		reloc_base, reloc_base_end);
8631a2
+
8631a2
+  if (!reloc_base && !reloc_base_end)
8631a2
+    return GRUB_EFI_SUCCESS;
8631a2
+
8631a2
+  if (!reloc_base || !reloc_base_end)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc table overflows binary");
8631a2
+      return GRUB_EFI_UNSUPPORTED;
8631a2
+    }
8631a2
+
8631a2
+  adjust = (grub_uint64_t)(grub_efi_uintn_t)data - context->image_address;
8631a2
+  if (adjust == 0)
8631a2
+    return GRUB_EFI_SUCCESS;
8631a2
+
8631a2
+  while (reloc_base < reloc_base_end)
8631a2
+    {
8631a2
+      grub_uint16_t *entry;
8631a2
+      reloc = (struct grub_pe32_fixup_block *)((char*)reloc_base);
8631a2
+
8631a2
+      if ((reloc_base->size == 0) ||
8631a2
+	  (reloc_base->size > context->reloc_dir->size))
8631a2
+	{
8631a2
+	  grub_error (GRUB_ERR_BAD_ARGUMENT,
8631a2
+		      "Reloc %d block size %d is invalid\n", n,
8631a2
+		      reloc_base->size);
8631a2
+	  return GRUB_EFI_UNSUPPORTED;
8631a2
+	}
8631a2
+
8631a2
+      entry = &reloc->entries[0];
8631a2
+      reloc_end = (struct grub_pe32_fixup_block *)
8631a2
+	((char *)reloc_base + reloc_base->size);
8631a2
+
8631a2
+      if ((void *)reloc_end < orig || (void *)reloc_end > image_end)
8631a2
+        {
8631a2
+          grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary",
8631a2
+		      n);
8631a2
+          return GRUB_EFI_UNSUPPORTED;
8631a2
+        }
8631a2
+
8631a2
+      fixup_base = image_address(data, size, reloc_base->rva);
8631a2
+
8631a2
+      if (!fixup_base)
8631a2
+        {
8631a2
+          grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc %d Invalid fixupbase", n);
8631a2
+          return GRUB_EFI_UNSUPPORTED;
8631a2
+        }
8631a2
+
8631a2
+      while ((void *)entry < (void *)reloc_end)
8631a2
+        {
8631a2
+          fixup = fixup_base + (*entry & 0xFFF);
8631a2
+          switch ((*entry) >> 12)
8631a2
+            {
8631a2
+              case GRUB_PE32_REL_BASED_ABSOLUTE:
8631a2
+                break;
8631a2
+              case GRUB_PE32_REL_BASED_HIGH:
8631a2
+                fixup_16 = (grub_uint16_t *)fixup;
8631a2
+                *fixup_16 = (grub_uint16_t)
8631a2
+		  (*fixup_16 + ((grub_uint16_t)((grub_uint32_t)adjust >> 16)));
8631a2
+                if (fixup_data != NULL)
8631a2
+                  {
8631a2
+                    *(grub_uint16_t *) fixup_data = *fixup_16;
8631a2
+                    fixup_data = fixup_data + sizeof (grub_uint16_t);
8631a2
+                  }
8631a2
+                break;
8631a2
+              case GRUB_PE32_REL_BASED_LOW:
8631a2
+                fixup_16 = (grub_uint16_t *)fixup;
8631a2
+                *fixup_16 = (grub_uint16_t) (*fixup_16 + (grub_uint16_t)adjust);
8631a2
+                if (fixup_data != NULL)
8631a2
+                  {
8631a2
+                    *(grub_uint16_t *) fixup_data = *fixup_16;
8631a2
+                    fixup_data = fixup_data + sizeof (grub_uint16_t);
8631a2
+                  }
8631a2
+                break;
8631a2
+              case GRUB_PE32_REL_BASED_HIGHLOW:
8631a2
+                fixup_32 = (grub_uint32_t *)fixup;
8631a2
+                *fixup_32 = *fixup_32 + (grub_uint32_t)adjust;
8631a2
+                if (fixup_data != NULL)
8631a2
+                  {
8631a2
+                    fixup_data = (char *)ALIGN_UP ((grub_addr_t)fixup_data, sizeof (grub_uint32_t));
8631a2
+                    *(grub_uint32_t *) fixup_data = *fixup_32;
8631a2
+                    fixup_data += sizeof (grub_uint32_t);
8631a2
+                  }
8631a2
+                break;
8631a2
+              case GRUB_PE32_REL_BASED_DIR64:
8631a2
+                fixup_64 = (grub_uint64_t *)fixup;
8631a2
+                *fixup_64 = *fixup_64 + (grub_uint64_t)adjust;
8631a2
+                if (fixup_data != NULL)
8631a2
+                  {
8631a2
+                    fixup_data = (char *)ALIGN_UP ((grub_addr_t)fixup_data, sizeof (grub_uint64_t));
8631a2
+                    *(grub_uint64_t *) fixup_data = *fixup_64;
8631a2
+                    fixup_data += sizeof (grub_uint64_t);
8631a2
+                  }
8631a2
+                break;
8631a2
+              default:
8631a2
+                grub_error (GRUB_ERR_BAD_ARGUMENT,
8631a2
+			    "Reloc %d unknown relocation type %d",
8631a2
+			    n, (*entry) >> 12);
8631a2
+                return GRUB_EFI_UNSUPPORTED;
8631a2
+            }
8631a2
+          entry += 1;
8631a2
+        }
8631a2
+      reloc_base = (struct grub_pe32_data_directory *)reloc_end;
8631a2
+      n++;
8631a2
+    }
8631a2
+
8631a2
+  return GRUB_EFI_SUCCESS;
8631a2
+}
8631a2
+
8631a2
+static grub_efi_device_path_t *
8631a2
+grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
8631a2
+{
8631a2
+  while (1)
8631a2
+    {
8631a2
+      grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp);
8631a2
+      grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp);
8631a2
+
8631a2
+      if (type == GRUB_EFI_END_DEVICE_PATH_TYPE)
8631a2
+        break;
8631a2
+      else if (type == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
8631a2
+            && subtype == GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE)
8631a2
+      return dp;
8631a2
+
8631a2
+      dp = GRUB_EFI_NEXT_DEVICE_PATH (dp);
8631a2
+    }
8631a2
+
8631a2
+    return NULL;
8631a2
+}
8631a2
+
8631a2
+static grub_efi_boolean_t
8631a2
+handle_image (void *data, grub_efi_uint32_t datasize)
8631a2
+{
8631a2
+  grub_efi_boot_services_t *b;
8631a2
+  grub_efi_loaded_image_t *li, li_bak;
8631a2
+  grub_efi_status_t efi_status;
8631a2
+  char *buffer = NULL;
8631a2
+  char *buffer_aligned = NULL;
8631a2
+  grub_efi_uint32_t i;
8631a2
+  struct grub_pe32_section_table *section;
8631a2
+  char *base, *end;
8631a2
+  pe_coff_loader_image_context_t context;
8631a2
+  grub_uint32_t section_alignment;
8631a2
+  grub_uint32_t buffer_size;
8631a2
+  int found_entry_point = 0;
8631a2
+  int rc;
8631a2
+
8631a2
+  b = grub_efi_system_table->boot_services;
8631a2
+
8631a2
+  rc = read_header (data, datasize, &context);
8631a2
+  if (rc < 0)
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "Failed to read header\n");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+  else if (rc == 0)
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "Secure Boot is not enabled\n");
8631a2
+      return 0;
8631a2
+    }
8631a2
+  else
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "Header read without error\n");
8631a2
+    }
8631a2
+
8631a2
+  /*
8631a2
+   * The spec says, uselessly, of SectionAlignment:
8631a2
+   * =====
8631a2
+   * The alignment (in bytes) of sections when they are loaded into
8631a2
+   * memory. It must be greater than or equal to FileAlignment. The
8631a2
+   * default is the page size for the architecture.
8631a2
+   * =====
8631a2
+   * Which doesn't tell you whose responsibility it is to enforce the
8631a2
+   * "default", or when.  It implies that the value in the field must
8631a2
+   * be > FileAlignment (also poorly defined), but it appears visual
8631a2
+   * studio will happily write 512 for FileAlignment (its default) and
8631a2
+   * 0 for SectionAlignment, intending to imply PAGE_SIZE.
8631a2
+   *
8631a2
+   * We only support one page size, so if it's zero, nerf it to 4096.
8631a2
+   */
8631a2
+  section_alignment = context.section_alignment;
8631a2
+  if (section_alignment == 0)
8631a2
+    section_alignment = 4096;
8631a2
+
8631a2
+  buffer_size = context.image_size + section_alignment;
8631a2
+  grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
8631a2
+	       context.image_size, datasize);
8631a2
+
8631a2
+  efi_status = efi_call_3 (b->allocate_pool, GRUB_EFI_LOADER_DATA,
8631a2
+			   buffer_size, &buffer);
8631a2
+
8631a2
+  if (efi_status != GRUB_EFI_SUCCESS)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  buffer_aligned = (char *)ALIGN_UP ((grub_addr_t)buffer, section_alignment);
8631a2
+  if (!buffer_aligned)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  grub_memcpy (buffer_aligned, data, context.size_of_headers);
8631a2
+
8631a2
+  entry_point = image_address (buffer_aligned, context.image_size,
8631a2
+			       context.entry_point);
8631a2
+
8631a2
+  grub_dprintf ("chain", "entry_point: %p\n", entry_point);
8631a2
+  if (!entry_point)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid entry point");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  char *reloc_base, *reloc_base_end;
8631a2
+  grub_dprintf ("chain", "reloc_dir: %p reloc_size: 0x%08x\n",
8631a2
+		(void *)(unsigned long)context.reloc_dir->rva,
8631a2
+		context.reloc_dir->size);
8631a2
+  reloc_base = image_address (buffer_aligned, context.image_size,
8631a2
+			      context.reloc_dir->rva);
8631a2
+  /* RelocBaseEnd here is the address of the last byte of the table */
8631a2
+  reloc_base_end = image_address (buffer_aligned, context.image_size,
8631a2
+				  context.reloc_dir->rva
8631a2
+				  + context.reloc_dir->size - 1);
8631a2
+  grub_dprintf ("chain", "reloc_base: %p reloc_base_end: %p\n",
8631a2
+		reloc_base, reloc_base_end);
8631a2
+
8631a2
+  struct grub_pe32_section_table *reloc_section = NULL, fake_reloc_section;
8631a2
+
8631a2
+  section = context.first_section;
8631a2
+  for (i = 0; i < context.number_of_sections; i++, section++)
8631a2
+    {
8631a2
+      char name[9];
8631a2
+
8631a2
+      base = image_address (buffer_aligned, context.image_size,
8631a2
+			    section->virtual_address);
8631a2
+      end = image_address (buffer_aligned, context.image_size,
8631a2
+			   section->virtual_address + section->virtual_size -1);
8631a2
+
8631a2
+      grub_strncpy(name, section->name, 9);
8631a2
+      name[8] = '\0';
8631a2
+      grub_dprintf ("chain", "Section %d \"%s\" at %p..%p\n", i,
8631a2
+		   name, base, end);
8631a2
+
8631a2
+      if (end < base)
8631a2
+	{
8631a2
+	  grub_dprintf ("chain", " base is %p but end is %p... bad.\n",
8631a2
+		       base, end);
8631a2
+	  grub_error (GRUB_ERR_BAD_ARGUMENT,
8631a2
+		      "Image has invalid negative size");
8631a2
+	  goto error_exit;
8631a2
+	}
8631a2
+
8631a2
+      if (section->virtual_address <= context.entry_point &&
8631a2
+	  (section->virtual_address + section->raw_data_size - 1)
8631a2
+	  > context.entry_point)
8631a2
+	{
8631a2
+	  found_entry_point++;
8631a2
+	  grub_dprintf ("chain", " section contains entry point\n");
8631a2
+	}
8631a2
+
8631a2
+      /* We do want to process .reloc, but it's often marked
8631a2
+       * discardable, so we don't want to memcpy it. */
8631a2
+      if (grub_memcmp (section->name, ".reloc\0\0", 8) == 0)
8631a2
+	{
8631a2
+	  if (reloc_section)
8631a2
+	    {
8631a2
+	      grub_error (GRUB_ERR_BAD_ARGUMENT,
8631a2
+			  "Image has multiple relocation sections");
8631a2
+	      goto error_exit;
8631a2
+	    }
8631a2
+
8631a2
+	  /* If it has nonzero sizes, and our bounds check
8631a2
+	   * made sense, and the VA and size match RelocDir's
8631a2
+	   * versions, then we believe in this section table. */
8631a2
+	  if (section->raw_data_size && section->virtual_size &&
8631a2
+	      base && end && reloc_base == base)
8631a2
+	    {
8631a2
+	      if (reloc_base_end == end)
8631a2
+		{
8631a2
+		  grub_dprintf ("chain", " section is relocation section\n");
8631a2
+		  reloc_section = section;
8631a2
+		}
8631a2
+	      else if (reloc_base_end && reloc_base_end < end)
8631a2
+	        {
8631a2
+		  /* Bogus virtual size in the reloc section -- RelocDir
8631a2
+		   * reported a smaller Base Relocation Directory. Decrease
8631a2
+		   * the section's virtual size so that it equal RelocDir's
8631a2
+		   * idea, but only for the purposes of relocate_coff(). */
8631a2
+		  grub_dprintf ("chain",
8631a2
+				" section is (overlong) relocation section\n");
8631a2
+		  grub_memcpy (&fake_reloc_section, section, sizeof *section);
8631a2
+		  fake_reloc_section.virtual_size -= (end - reloc_base_end);
8631a2
+		  reloc_section = &fake_reloc_section;
8631a2
+		}
8631a2
+	    }
8631a2
+
8631a2
+	  if (!reloc_section)
8631a2
+	    {
8631a2
+	      grub_dprintf ("chain", " section is not reloc section?\n");
8631a2
+	      grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n",
8631a2
+			    section->raw_data_size, section->virtual_size);
8631a2
+	      grub_dprintf ("chain", " base: %p end: %p\n", base, end);
8631a2
+	      grub_dprintf ("chain", " reloc_base: %p reloc_base_end: %p\n",
8631a2
+			    reloc_base, reloc_base_end);
8631a2
+	    }
8631a2
+	}
8631a2
+
8631a2
+      grub_dprintf ("chain", " Section characteristics are %08x\n",
8631a2
+		   section->characteristics);
8631a2
+      grub_dprintf ("chain", " Section virtual size: %08x\n",
8631a2
+		   section->virtual_size);
8631a2
+      grub_dprintf ("chain", " Section raw_data size: %08x\n",
8631a2
+		   section->raw_data_size);
8631a2
+      if (section->characteristics & GRUB_PE32_SCN_MEM_DISCARDABLE)
8631a2
+	{
8631a2
+	  grub_dprintf ("chain", " Discarding section\n");
8631a2
+	  continue;
8631a2
+	}
8631a2
+
8631a2
+      if (!base || !end)
8631a2
+        {
8631a2
+	  grub_dprintf ("chain", " section is invalid\n");
8631a2
+          grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid section size");
8631a2
+          goto error_exit;
8631a2
+        }
8631a2
+
8631a2
+      if (section->characteristics & GRUB_PE32_SCN_CNT_UNINITIALIZED_DATA)
8631a2
+	{
8631a2
+	  if (section->raw_data_size != 0)
8631a2
+	    grub_dprintf ("chain", " UNINITIALIZED_DATA section has data?\n");
8631a2
+	}
8631a2
+      else if (section->virtual_address < context.size_of_headers ||
8631a2
+	       section->raw_data_offset < context.size_of_headers)
8631a2
+	{
8631a2
+	  grub_error (GRUB_ERR_BAD_ARGUMENT,
8631a2
+		      "Section %d is inside image headers", i);
8631a2
+	  goto error_exit;
8631a2
+	}
8631a2
+
8631a2
+      if (section->raw_data_size > 0)
8631a2
+	{
8631a2
+	  grub_dprintf ("chain", " copying 0x%08x bytes to %p\n",
8631a2
+			section->raw_data_size, base);
8631a2
+	  grub_memcpy (base,
8631a2
+		       (grub_efi_uint8_t*)data + section->raw_data_offset,
8631a2
+		       section->raw_data_size);
8631a2
+	}
8631a2
+
8631a2
+      if (section->raw_data_size < section->virtual_size)
8631a2
+	{
8631a2
+	  grub_dprintf ("chain", " padding with 0x%08x bytes at %p\n",
8631a2
+			section->virtual_size - section->raw_data_size,
8631a2
+			base + section->raw_data_size);
8631a2
+	  grub_memset (base + section->raw_data_size, 0,
8631a2
+		       section->virtual_size - section->raw_data_size);
8631a2
+	}
8631a2
+
8631a2
+      grub_dprintf ("chain", " finished section %s\n", name);
8631a2
+    }
8631a2
+
8631a2
+  /* 5 == EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC */
8631a2
+  if (context.number_of_rva_and_sizes <= 5)
8631a2
+    {
8631a2
+      grub_dprintf ("chain", "image has no relocation entry\n");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  if (context.reloc_dir->size && reloc_section)
8631a2
+    {
8631a2
+      /* run the relocation fixups */
8631a2
+      efi_status = relocate_coff (&context, reloc_section, data,
8631a2
+				  buffer_aligned);
8631a2
+
8631a2
+      if (efi_status != GRUB_EFI_SUCCESS)
8631a2
+	{
8631a2
+	  grub_error (GRUB_ERR_BAD_ARGUMENT, "relocation failed");
8631a2
+	  goto error_exit;
8631a2
+	}
8631a2
+    }
8631a2
+
8631a2
+  if (!found_entry_point)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "entry point is not within sections");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+  if (found_entry_point > 1)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "%d sections contain entry point",
8631a2
+		  found_entry_point);
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  li = grub_efi_get_loaded_image (grub_efi_image_handle);
8631a2
+  if (!li)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "no loaded image available");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  grub_memcpy (&li_bak, li, sizeof (grub_efi_loaded_image_t));
8631a2
+  li->image_base = buffer_aligned;
8631a2
+  li->image_size = context.image_size;
8631a2
+  li->load_options = cmdline;
8631a2
+  li->load_options_size = cmdline_len;
8631a2
+  li->file_path = grub_efi_get_media_file_path (file_path);
8631a2
+  li->device_handle = dev_handle;
8631a2
+  if (!li->file_path)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching file path found");
8631a2
+      goto error_exit;
8631a2
+    }
8631a2
+
8631a2
+  grub_dprintf ("chain", "booting via entry point\n");
8631a2
+  efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
8631a2
+			   grub_efi_system_table);
8631a2
+
8631a2
+  grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
8631a2
+  grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
8631a2
+  efi_status = efi_call_1 (b->free_pool, buffer);
8631a2
+
8631a2
+  return 1;
8631a2
+
8631a2
+error_exit:
8631a2
+  grub_dprintf ("chain", "error_exit: grub_errno: %d\n", grub_errno);
8631a2
+  if (buffer)
8631a2
+      efi_call_1 (b->free_pool, buffer);
8631a2
+
8631a2
+  return 0;
8631a2
+}
8631a2
+
8631a2
+static grub_err_t
8631a2
+grub_secureboot_chainloader_unload (void)
8631a2
+{
8631a2
+  grub_efi_boot_services_t *b;
8631a2
+
8631a2
+  b = grub_efi_system_table->boot_services;
8631a2
+  efi_call_2 (b->free_pages, address, pages);
8631a2
+  grub_free (file_path);
8631a2
+  grub_free (cmdline);
8631a2
+  cmdline = 0;
8631a2
+  file_path = 0;
8631a2
+  dev_handle = 0;
8631a2
+
8631a2
+  grub_dl_unref (my_mod);
8631a2
+  return GRUB_ERR_NONE;
8631a2
+}
8631a2
+
8631a2
+static grub_err_t
8631a2
+grub_load_and_start_image(void *boot_image)
8631a2
+{
8631a2
+  grub_efi_boot_services_t *b;
8631a2
+  grub_efi_status_t status;
8631a2
+  grub_efi_loaded_image_t *loaded_image;
8631a2
+
8631a2
+  b = grub_efi_system_table->boot_services;
8631a2
+
8631a2
+  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
8631a2
+		       boot_image, fsize, &image_handle);
8631a2
+  if (status != GRUB_EFI_SUCCESS)
8631a2
+    {
8631a2
+      if (status == GRUB_EFI_OUT_OF_RESOURCES)
8631a2
+	grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of resources");
8631a2
+      else
8631a2
+	grub_error (GRUB_ERR_BAD_OS, "cannot load image");
8631a2
+      return -1;
8631a2
+    }
8631a2
+
8631a2
+  /* LoadImage does not set a device handler when the image is
8631a2
+     loaded from memory, so it is necessary to set it explicitly here.
8631a2
+     This is a mess.  */
8631a2
+  loaded_image = grub_efi_get_loaded_image (image_handle);
8631a2
+  if (! loaded_image)
8631a2
+    {
8631a2
+      grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
8631a2
+      return -1;
8631a2
+    }
8631a2
+  loaded_image->device_handle = dev_handle;
8631a2
+
8631a2
+  if (cmdline)
8631a2
+    {
8631a2
+      loaded_image->load_options = cmdline;
8631a2
+      loaded_image->load_options_size = cmdline_len;
8631a2
+    }
8631a2
+
8631a2
+  return 0;
8631a2
+}
8631a2
+
8631a2
+static grub_err_t
8631a2
+grub_secureboot_chainloader_boot (void)
8631a2
+{
8631a2
+  int rc;
8631a2
+  rc = handle_image ((void *)(unsigned long)address, fsize);
8631a2
+  if (rc == 0)
8631a2
+    {
8631a2
+      grub_load_and_start_image((void *)(unsigned long)address);
8631a2
+    }
8631a2
+
8631a2
+  grub_loader_unset ();
8631a2
+  return grub_errno;
8631a2
+}
8631a2
+
8631a2
 static grub_err_t
8631a2
 grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
 		      int argc, char *argv[])
8631a2
 {
8631a2
   grub_file_t file = 0;
8631a2
-  grub_ssize_t size;
8631a2
   grub_efi_status_t status;
8631a2
   grub_efi_boot_services_t *b;
8631a2
   grub_device_t dev = 0;
8631a2
   grub_efi_device_path_t *dp = 0;
8631a2
-  grub_efi_loaded_image_t *loaded_image;
8631a2
   char *filename;
8631a2
   void *boot_image = 0;
8631a2
-  grub_efi_handle_t dev_handle = 0;
8631a2
+  int rc;
8631a2
 
8631a2
   if (argc == 0)
8631a2
     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
8631a2
@@ -216,15 +893,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
   address = 0;
8631a2
   image_handle = 0;
8631a2
   file_path = 0;
8631a2
+  dev_handle = 0;
8631a2
 
8631a2
   b = grub_efi_system_table->boot_services;
8631a2
 
8631a2
+  if (argc > 1)
8631a2
+    {
8631a2
+      int i;
8631a2
+      grub_efi_char16_t *p16;
8631a2
+
8631a2
+      for (i = 1, cmdline_len = 0; i < argc; i++)
8631a2
+        cmdline_len += grub_strlen (argv[i]) + 1;
8631a2
+
8631a2
+      cmdline_len *= sizeof (grub_efi_char16_t);
8631a2
+      cmdline = p16 = grub_malloc (cmdline_len);
8631a2
+      if (! cmdline)
8631a2
+        goto fail;
8631a2
+
8631a2
+      for (i = 1; i < argc; i++)
8631a2
+        {
8631a2
+          char *p8;
8631a2
+
8631a2
+          p8 = argv[i];
8631a2
+          while (*p8)
8631a2
+            *(p16++) = *(p8++);
8631a2
+
8631a2
+          *(p16++) = ' ';
8631a2
+        }
8631a2
+      *(--p16) = 0;
8631a2
+    }
8631a2
+
8631a2
   file = grub_file_open (filename);
8631a2
   if (! file)
8631a2
     goto fail;
8631a2
 
8631a2
-  /* Get the root device's device path.  */
8631a2
-  dev = grub_device_open (0);
8631a2
+  /* Get the device path from filename. */
8631a2
+  char *devname = grub_file_get_device_name (filename);
8631a2
+  dev = grub_device_open (devname);
8631a2
+  if (devname)
8631a2
+    grub_free (devname);
8631a2
   if (! dev)
8631a2
     goto fail;
8631a2
 
8631a2
@@ -261,17 +968,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
   if (! file_path)
8631a2
     goto fail;
8631a2
 
8631a2
-  grub_printf ("file path: ");
8631a2
-  grub_efi_print_device_path (file_path);
8631a2
-
8631a2
-  size = grub_file_size (file);
8631a2
-  if (!size)
8631a2
+  fsize = grub_file_size (file);
8631a2
+  if (!fsize)
8631a2
     {
8631a2
       grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
8631a2
 		  filename);
8631a2
       goto fail;
8631a2
     }
8631a2
-  pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
8631a2
+  pages = (((grub_efi_uintn_t) fsize + ((1 << 12) - 1)) >> 12);
8631a2
 
8631a2
   status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
8631a2
 			      GRUB_EFI_LOADER_CODE,
8631a2
@@ -285,7 +989,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
     }
8631a2
 
8631a2
   boot_image = (void *) ((grub_addr_t) address);
8631a2
-  if (grub_file_read (file, boot_image, size) != size)
8631a2
+  if (grub_file_read (file, boot_image, fsize) != fsize)
8631a2
     {
8631a2
       if (grub_errno == GRUB_ERR_NONE)
8631a2
 	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
8631a2
@@ -295,7 +999,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
     }
8631a2
 
8631a2
 #if defined (__i386__) || defined (__x86_64__)
8631a2
-  if (size >= (grub_ssize_t) sizeof (struct grub_macho_fat_header))
8631a2
+  if (fsize >= (grub_ssize_t) sizeof (struct grub_macho_fat_header))
8631a2
     {
8631a2
       struct grub_macho_fat_header *head = boot_image;
8631a2
       if (head->magic
8631a2
@@ -304,6 +1008,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
 	  grub_uint32_t i;
8631a2
 	  struct grub_macho_fat_arch *archs
8631a2
 	    = (struct grub_macho_fat_arch *) (head + 1);
8631a2
+
8631a2
+	  if (grub_efi_secure_boot())
8631a2
+	    {
8631a2
+	      grub_error (GRUB_ERR_BAD_OS,
8631a2
+			  "MACHO binaries are forbidden with Secure Boot");
8631a2
+	      goto fail;
8631a2
+	    }
8631a2
+
8631a2
 	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
8631a2
 	    {
8631a2
 	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
8631a2
@@ -318,79 +1030,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
 	      > ~grub_cpu_to_le32 (archs[i].size)
8631a2
 	      || grub_cpu_to_le32 (archs[i].offset)
8631a2
 	      + grub_cpu_to_le32 (archs[i].size)
8631a2
-	      > (grub_size_t) size)
8631a2
+	      > (grub_size_t) fsize)
8631a2
 	    {
8631a2
 	      grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
8631a2
 			  filename);
8631a2
 	      goto fail;
8631a2
 	    }
8631a2
 	  boot_image = (char *) boot_image + grub_cpu_to_le32 (archs[i].offset);
8631a2
-	  size = grub_cpu_to_le32 (archs[i].size);
8631a2
+	  fsize = grub_cpu_to_le32 (archs[i].size);
8631a2
 	}
8631a2
     }
8631a2
 #endif
8631a2
 
8631a2
-  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
8631a2
-		       boot_image, size,
8631a2
-		       &image_handle);
8631a2
-  if (status != GRUB_EFI_SUCCESS)
8631a2
+  rc = grub_linuxefi_secure_validate((void *)(unsigned long)address, fsize);
8631a2
+  grub_dprintf ("chain", "linuxefi_secure_validate: %d\n", rc);
8631a2
+  if (rc > 0)
8631a2
     {
8631a2
-      if (status == GRUB_EFI_OUT_OF_RESOURCES)
8631a2
-	grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of resources");
8631a2
-      else
8631a2
-	grub_error (GRUB_ERR_BAD_OS, "cannot load image");
8631a2
-
8631a2
-      goto fail;
8631a2
+      grub_file_close (file);
8631a2
+      grub_device_close (dev);
8631a2
+      grub_loader_set (grub_secureboot_chainloader_boot,
8631a2
+		       grub_secureboot_chainloader_unload, 0);
8631a2
+      return 0;
8631a2
     }
8631a2
-
8631a2
-  /* LoadImage does not set a device handler when the image is
8631a2
-     loaded from memory, so it is necessary to set it explicitly here.
8631a2
-     This is a mess.  */
8631a2
-  loaded_image = grub_efi_get_loaded_image (image_handle);
8631a2
-  if (! loaded_image)
8631a2
+  else if (rc == 0)
8631a2
     {
8631a2
-      grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
8631a2
-      goto fail;
8631a2
-    }
8631a2
-  loaded_image->device_handle = dev_handle;
8631a2
-
8631a2
-  if (argc > 1)
8631a2
-    {
8631a2
-      int i, len;
8631a2
-      grub_efi_char16_t *p16;
8631a2
-
8631a2
-      for (i = 1, len = 0; i < argc; i++)
8631a2
-        len += grub_strlen (argv[i]) + 1;
8631a2
-
8631a2
-      len *= sizeof (grub_efi_char16_t);
8631a2
-      cmdline = p16 = grub_malloc (len);
8631a2
-      if (! cmdline)
8631a2
-        goto fail;
8631a2
+      grub_load_and_start_image(boot_image);
8631a2
+      grub_file_close (file);
8631a2
+      grub_device_close (dev);
8631a2
+      grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
8631a2
 
8631a2
-      for (i = 1; i < argc; i++)
8631a2
-        {
8631a2
-          char *p8;
8631a2
-
8631a2
-          p8 = argv[i];
8631a2
-          while (*p8)
8631a2
-            *(p16++) = *(p8++);
8631a2
-
8631a2
-          *(p16++) = ' ';
8631a2
-        }
8631a2
-      *(--p16) = 0;
8631a2
-
8631a2
-      loaded_image->load_options = cmdline;
8631a2
-      loaded_image->load_options_size = len;
8631a2
+      return 0;
8631a2
     }
8631a2
 
8631a2
-  grub_file_close (file);
8631a2
-  grub_device_close (dev);
8631a2
-
8631a2
-  grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
8631a2
-  return 0;
8631a2
-
8631a2
- fail:
8631a2
-
8631a2
+fail:
8631a2
   if (dev)
8631a2
     grub_device_close (dev);
8631a2
 
8631a2
@@ -402,6 +1074,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
8631a2
   if (address)
8631a2
     efi_call_2 (b->free_pages, address, pages);
8631a2
 
8631a2
+  if (cmdline)
8631a2
+    grub_free (cmdline);
8631a2
+
8631a2
   grub_dl_unref (my_mod);
8631a2
 
8631a2
   return grub_errno;
8631a2
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
b32e65
index c24202a5d..c8ecce6df 100644
8631a2
--- a/grub-core/loader/efi/linux.c
8631a2
+++ b/grub-core/loader/efi/linux.c
8631a2
@@ -33,21 +33,34 @@ struct grub_efi_shim_lock
8631a2
 };
8631a2
 typedef struct grub_efi_shim_lock grub_efi_shim_lock_t;
8631a2
 
8631a2
-grub_efi_boolean_t
8631a2
+int
8631a2
 grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
8631a2
 {
8631a2
   grub_efi_guid_t guid = SHIM_LOCK_GUID;
8631a2
   grub_efi_shim_lock_t *shim_lock;
8631a2
+  grub_efi_status_t status;
8631a2
 
8631a2
   shim_lock = grub_efi_locate_protocol(&guid, NULL);
8631a2
-
8631a2
+  grub_dprintf ("secureboot", "shim_lock: %p\n", shim_lock);
8631a2
   if (!shim_lock)
8631a2
-    return 1;
8631a2
+    {
8631a2
+      grub_dprintf ("secureboot", "shim not available\n");
8631a2
+      return 0;
8631a2
+    }
8631a2
 
8631a2
-  if (shim_lock->verify(data, size) == GRUB_EFI_SUCCESS)
8631a2
-    return 1;
8631a2
+  grub_dprintf ("secureboot", "Asking shim to verify kernel signature\n");
8631a2
+  status = shim_lock->verify (data, size);
8631a2
+  grub_dprintf ("secureboot", "shim_lock->verify(): %ld\n", (long int)status);
8631a2
+  if (status == GRUB_EFI_SUCCESS)
8631a2
+    {
8631a2
+      grub_dprintf ("secureboot", "Kernel signature verification passed\n");
8631a2
+      return 1;
8631a2
+    }
8631a2
 
8631a2
-  return 0;
8631a2
+  grub_dprintf ("secureboot", "Kernel signature verification failed (0x%lx)\n",
8631a2
+		(unsigned long) status);
8631a2
+
8631a2
+  return -1;
8631a2
 }
8631a2
 
8631a2
 #pragma GCC diagnostic push
8631a2
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
b32e65
index 3db82e782..8db228c5b 100644
8631a2
--- a/grub-core/loader/i386/efi/linux.c
8631a2
+++ b/grub-core/loader/i386/efi/linux.c
8631a2
@@ -118,6 +118,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
8631a2
       goto fail;
8631a2
     }
8631a2
 
8631a2
+  grub_dprintf ("linux", "initrd_mem = %lx\n", (unsigned long) initrd_mem);
8631a2
+
8631a2
   params->ramdisk_size = size;
8631a2
   params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
8631a2
 
8631a2
@@ -160,6 +162,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
   struct linux_kernel_header lh;
8631a2
   grub_ssize_t len, start, filelen;
8631a2
   void *kernel = NULL;
8631a2
+  int rc;
8631a2
 
8631a2
   grub_dl_ref (my_mod);
8631a2
 
8631a2
@@ -185,11 +188,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
 
8631a2
   if (grub_file_read (file, kernel, filelen) != filelen)
8631a2
     {
8631a2
-      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"), argv[0]);
8631a2
+      grub_error (GRUB_ERR_FILE_READ_ERROR, N_("Can't read kernel %s"),
8631a2
+		  argv[0]);
8631a2
       goto fail;
8631a2
     }
8631a2
 
8631a2
-  if (! grub_linuxefi_secure_validate (kernel, filelen))
8631a2
+  rc = grub_linuxefi_secure_validate (kernel, filelen);
8631a2
+  if (rc < 0)
8631a2
     {
8631a2
       grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"),
8631a2
 		  argv[0]);
8631a2
@@ -204,6 +209,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
       goto fail;
8631a2
     }
8631a2
 
8631a2
+  grub_dprintf ("linux", "params = %lx\n", (unsigned long) params);
8631a2
+
8631a2
   grub_memset (params, 0, 16384);
8631a2
 
8631a2
   grub_memcpy (&lh, kernel, sizeof (lh));
8631a2
@@ -242,6 +249,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
       goto fail;
8631a2
     }
8631a2
 
8631a2
+  grub_dprintf ("linux", "linux_cmdline = %lx\n",
8631a2
+		(unsigned long)linux_cmdline);
8631a2
+
8631a2
   grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
8631a2
   grub_create_loader_cmdline (argc, argv,
8631a2
                               linux_cmdline + sizeof (LINUX_IMAGE) - 1,
8631a2
@@ -275,9 +285,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
8631a2
   grub_memcpy (params, &lh, 2 * 512);
8631a2
 
8631a2
   params->type_of_loader = 0x21;
8631a2
+  grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
8631a2
+	       kernel_mem, handover_offset);
8631a2
 
8631a2
  fail:
8631a2
-
8631a2
   if (file)
8631a2
     grub_file_close (file);
8631a2
 
8631a2
diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
b32e65
index d9ede3677..0033d9305 100644
8631a2
--- a/include/grub/efi/linux.h
8631a2
+++ b/include/grub/efi/linux.h
8631a2
@@ -22,7 +22,7 @@
8631a2
 #include <grub/err.h>
8631a2
 #include <grub/symbol.h>
8631a2
 
8631a2
-grub_efi_boolean_t
8631a2
+int
8631a2
 EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size);
8631a2
 grub_err_t
8631a2
 EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
8631a2
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
b32e65
index 7d44732d2..c03cc599f 100644
8631a2
--- a/include/grub/efi/pe32.h
8631a2
+++ b/include/grub/efi/pe32.h
8631a2
@@ -214,7 +214,11 @@ struct grub_pe64_optional_header
8631a2
 struct grub_pe32_section_table
8631a2
 {
8631a2
   char name[8];
8631a2
-  grub_uint32_t virtual_size;
8631a2
+  union
8631a2
+    {
8631a2
+      grub_uint32_t physical_address;
8631a2
+      grub_uint32_t virtual_size;
8631a2
+    };
8631a2
   grub_uint32_t virtual_address;
8631a2
   grub_uint32_t raw_data_size;
8631a2
   grub_uint32_t raw_data_offset;
8631a2
@@ -225,12 +229,18 @@ struct grub_pe32_section_table
8631a2
   grub_uint32_t characteristics;
8631a2
 };
8631a2
 
8631a2
+#define GRUB_PE32_SCN_TYPE_NO_PAD		0x00000008
8631a2
 #define GRUB_PE32_SCN_CNT_CODE			0x00000020
8631a2
 #define GRUB_PE32_SCN_CNT_INITIALIZED_DATA	0x00000040
8631a2
-#define GRUB_PE32_SCN_MEM_DISCARDABLE		0x02000000
8631a2
-#define GRUB_PE32_SCN_MEM_EXECUTE		0x20000000
8631a2
-#define GRUB_PE32_SCN_MEM_READ			0x40000000
8631a2
-#define GRUB_PE32_SCN_MEM_WRITE			0x80000000
8631a2
+#define GRUB_PE32_SCN_CNT_UNINITIALIZED_DATA	0x00000080
8631a2
+#define GRUB_PE32_SCN_LNK_OTHER			0x00000100
8631a2
+#define GRUB_PE32_SCN_LNK_INFO			0x00000200
8631a2
+#define GRUB_PE32_SCN_LNK_REMOVE		0x00000800
8631a2
+#define GRUB_PE32_SCN_LNK_COMDAT		0x00001000
8631a2
+#define GRUB_PE32_SCN_GPREL			0x00008000
8631a2
+#define GRUB_PE32_SCN_MEM_16BIT			0x00020000
8631a2
+#define GRUB_PE32_SCN_MEM_LOCKED		0x00040000
8631a2
+#define GRUB_PE32_SCN_MEM_PRELOAD		0x00080000
8631a2
 
8631a2
 #define GRUB_PE32_SCN_ALIGN_1BYTES		0x00100000
8631a2
 #define GRUB_PE32_SCN_ALIGN_2BYTES		0x00200000
8631a2
@@ -239,10 +249,28 @@ struct grub_pe32_section_table
8631a2
 #define GRUB_PE32_SCN_ALIGN_16BYTES		0x00500000
8631a2
 #define GRUB_PE32_SCN_ALIGN_32BYTES		0x00600000
8631a2
 #define GRUB_PE32_SCN_ALIGN_64BYTES		0x00700000
8631a2
+#define GRUB_PE32_SCN_ALIGN_128BYTES		0x00800000
8631a2
+#define GRUB_PE32_SCN_ALIGN_256BYTES		0x00900000
8631a2
+#define GRUB_PE32_SCN_ALIGN_512BYTES		0x00A00000
8631a2
+#define GRUB_PE32_SCN_ALIGN_1024BYTES		0x00B00000
8631a2
+#define GRUB_PE32_SCN_ALIGN_2048BYTES		0x00C00000
8631a2
+#define GRUB_PE32_SCN_ALIGN_4096BYTES		0x00D00000
8631a2
+#define GRUB_PE32_SCN_ALIGN_8192BYTES		0x00E00000
8631a2
 
8631a2
 #define GRUB_PE32_SCN_ALIGN_SHIFT		20
8631a2
 #define GRUB_PE32_SCN_ALIGN_MASK		7
8631a2
 
8631a2
+#define GRUB_PE32_SCN_LNK_NRELOC_OVFL		0x01000000
8631a2
+#define GRUB_PE32_SCN_MEM_DISCARDABLE		0x02000000
8631a2
+#define GRUB_PE32_SCN_MEM_NOT_CACHED		0x04000000
8631a2
+#define GRUB_PE32_SCN_MEM_NOT_PAGED		0x08000000
8631a2
+#define GRUB_PE32_SCN_MEM_SHARED		0x10000000
8631a2
+#define GRUB_PE32_SCN_MEM_EXECUTE		0x20000000
8631a2
+#define GRUB_PE32_SCN_MEM_READ			0x40000000
8631a2
+#define GRUB_PE32_SCN_MEM_WRITE			0x80000000
8631a2
+
8631a2
+
8631a2
+
8631a2
 #define GRUB_PE32_SIGNATURE_SIZE 4
8631a2
 
8631a2
 struct grub_pe32_header
8631a2
@@ -265,6 +293,20 @@ struct grub_pe32_header
8631a2
 #endif
8631a2
 };
8631a2
 
8631a2
+struct grub_pe32_header_32
8631a2
+{
8631a2
+  char signature[GRUB_PE32_SIGNATURE_SIZE];
8631a2
+  struct grub_pe32_coff_header coff_header;
8631a2
+  struct grub_pe32_optional_header optional_header;
8631a2
+};
8631a2
+
8631a2
+struct grub_pe32_header_64
8631a2
+{
8631a2
+  char signature[GRUB_PE32_SIGNATURE_SIZE];
8631a2
+  struct grub_pe32_coff_header coff_header;
8631a2
+  struct grub_pe64_optional_header optional_header;
8631a2
+};
8631a2
+
8631a2
 struct grub_pe32_fixup_block
8631a2
 {
8631a2
   grub_uint32_t page_rva;