|
 |
f725e3 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f725e3 |
From: Matthew Garrett <mjg59@coreos.com>
|
|
|
f725e3 |
Date: Sun, 9 Aug 2015 16:12:39 -0700
|
|
|
f725e3 |
Subject: [PATCH] Rework linux command
|
|
|
f725e3 |
|
|
|
f725e3 |
We want a single buffer that contains the entire kernel image in order to
|
|
|
f725e3 |
perform a TPM measurement. Allocate one and copy the entire kernel into it
|
|
|
f725e3 |
before pulling out the individual blocks later on.
|
|
|
f725e3 |
---
|
|
|
f725e3 |
grub-core/loader/i386/linux.c | 34 +++++++++++++++++++++-------------
|
|
|
f725e3 |
1 file changed, 21 insertions(+), 13 deletions(-)
|
|
|
f725e3 |
|
|
|
f725e3 |
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
f725e3 |
index bd37c69b5d0..53f74ae0685 100644
|
|
|
f725e3 |
--- a/grub-core/loader/i386/linux.c
|
|
|
f725e3 |
+++ b/grub-core/loader/i386/linux.c
|
|
|
f725e3 |
@@ -682,12 +682,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
grub_file_t file = 0;
|
|
|
f725e3 |
struct linux_kernel_header lh;
|
|
|
f725e3 |
grub_uint8_t setup_sects;
|
|
|
f725e3 |
- grub_size_t real_size, prot_size, prot_file_size;
|
|
|
f725e3 |
+ grub_size_t real_size, prot_size, prot_file_size, kernel_offset;
|
|
|
f725e3 |
grub_ssize_t len;
|
|
|
f725e3 |
int i;
|
|
|
f725e3 |
grub_size_t align, min_align;
|
|
|
f725e3 |
int relocatable;
|
|
|
f725e3 |
grub_uint64_t preferred_address = GRUB_LINUX_BZIMAGE_ADDR;
|
|
|
f725e3 |
+ grub_uint8_t *kernel = NULL;
|
|
|
f725e3 |
|
|
|
f725e3 |
grub_dl_ref (my_mod);
|
|
|
f725e3 |
|
|
|
f725e3 |
@@ -701,7 +702,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
if (! file)
|
|
|
f725e3 |
goto fail;
|
|
|
f725e3 |
|
|
|
f725e3 |
- if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
|
|
|
f725e3 |
+ len = grub_file_size (file);
|
|
|
f725e3 |
+ kernel = grub_malloc (len);
|
|
|
f725e3 |
+ if (!kernel)
|
|
|
f725e3 |
+ {
|
|
|
f725e3 |
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
|
|
|
f725e3 |
+ goto fail;
|
|
|
f725e3 |
+ }
|
|
|
f725e3 |
+
|
|
|
f725e3 |
+ if (grub_file_read (file, kernel, len) != len)
|
|
|
f725e3 |
{
|
|
|
f725e3 |
if (!grub_errno)
|
|
|
f725e3 |
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
|
|
f725e3 |
@@ -709,6 +718,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
goto fail;
|
|
|
f725e3 |
}
|
|
|
f725e3 |
|
|
|
f725e3 |
+ grub_memcpy (&lh, kernel, sizeof (lh));
|
|
|
f725e3 |
+ kernel_offset = sizeof (lh);
|
|
|
f725e3 |
+
|
|
|
f725e3 |
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
|
|
|
f725e3 |
{
|
|
|
f725e3 |
grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
|
|
|
f725e3 |
@@ -808,13 +820,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
linux_params.ps_mouse = linux_params.padding10 = 0;
|
|
|
f725e3 |
|
|
|
f725e3 |
len = sizeof (linux_params) - sizeof (lh);
|
|
|
f725e3 |
- if (grub_file_read (file, (char *) &linux_params + sizeof (lh), len) != len)
|
|
|
f725e3 |
- {
|
|
|
f725e3 |
- if (!grub_errno)
|
|
|
f725e3 |
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
|
|
f725e3 |
- argv[0]);
|
|
|
f725e3 |
- goto fail;
|
|
|
f725e3 |
- }
|
|
|
f725e3 |
+
|
|
|
f725e3 |
+ grub_memcpy (&linux_params + sizeof (lh), kernel + kernel_offset, len);
|
|
|
f725e3 |
+ kernel_offset += len;
|
|
|
f725e3 |
|
|
|
f725e3 |
linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
|
|
|
f725e3 |
|
|
|
f725e3 |
@@ -873,7 +881,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
|
|
|
f725e3 |
/* The other parameters are filled when booting. */
|
|
|
f725e3 |
|
|
|
f725e3 |
- grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
|
|
|
f725e3 |
+ kernel_offset = real_size + GRUB_DISK_SECTOR_SIZE;
|
|
|
f725e3 |
|
|
|
f725e3 |
grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
|
|
|
f725e3 |
(unsigned) real_size, (unsigned) prot_size);
|
|
|
f725e3 |
@@ -1018,9 +1026,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
- (sizeof (LINUX_IMAGE) - 1));
|
|
|
f725e3 |
|
|
|
f725e3 |
len = prot_file_size;
|
|
|
f725e3 |
- if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno)
|
|
|
f725e3 |
- grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
|
|
f725e3 |
- argv[0]);
|
|
|
f725e3 |
+ grub_memcpy (prot_mode_mem, kernel + kernel_offset, len);
|
|
|
f725e3 |
|
|
|
f725e3 |
if (grub_errno == GRUB_ERR_NONE)
|
|
|
f725e3 |
{
|
|
|
f725e3 |
@@ -1031,6 +1037,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f725e3 |
|
|
|
f725e3 |
fail:
|
|
|
f725e3 |
|
|
|
f725e3 |
+ grub_free (kernel);
|
|
|
f725e3 |
+
|
|
|
f725e3 |
if (file)
|
|
|
f725e3 |
grub_file_close (file);
|
|
|
f725e3 |
|