|
 |
15a2072 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
15a2072 |
From: Matthew Garrett <mjg59@coreos.com>
|
|
|
15a2072 |
Date: Tue, 1 Sep 2015 16:02:55 -0700
|
|
|
15a2072 |
Subject: [PATCH] Measure multiboot images and modules
|
|
|
15a2072 |
|
|
|
15a2072 |
---
|
|
|
15a2072 |
grub-core/loader/i386/multiboot_mbi.c | 3 +++
|
|
|
15a2072 |
grub-core/loader/multiboot.c | 2 ++
|
|
|
15a2072 |
grub-core/loader/multiboot_mbi2.c | 4 +++-
|
|
|
15a2072 |
3 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
15a2072 |
|
|
|
15a2072 |
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
|
|
|
15a2072 |
index dc98dbcae25..1c5b0ac25ce 100644
|
|
|
15a2072 |
--- a/grub-core/loader/i386/multiboot_mbi.c
|
|
|
15a2072 |
+++ b/grub-core/loader/i386/multiboot_mbi.c
|
|
|
15a2072 |
@@ -36,6 +36,7 @@
|
|
|
15a2072 |
#include <grub/net.h>
|
|
|
15a2072 |
#include <grub/i18n.h>
|
|
|
15a2072 |
#include <grub/lib/cmdline.h>
|
|
|
15a2072 |
+#include <grub/tpm.h>
|
|
|
15a2072 |
|
|
|
15a2072 |
#ifdef GRUB_MACHINE_EFI
|
|
|
15a2072 |
#include <grub/efi/efi.h>
|
|
|
15a2072 |
@@ -173,6 +174,8 @@ grub_multiboot_load (grub_file_t file, const char *filename)
|
|
|
15a2072 |
return grub_errno;
|
|
|
15a2072 |
}
|
|
|
15a2072 |
|
|
|
15a2072 |
+ grub_tpm_measure((unsigned char*)buffer, len, GRUB_KERNEL_PCR, filename);
|
|
|
15a2072 |
+
|
|
|
15a2072 |
header = find_header (buffer, len);
|
|
|
15a2072 |
|
|
|
15a2072 |
if (header == 0)
|
|
|
15a2072 |
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
|
|
|
15a2072 |
index 26df46a4161..93e026c53db 100644
|
|
|
15a2072 |
--- a/grub-core/loader/multiboot.c
|
|
|
15a2072 |
+++ b/grub-core/loader/multiboot.c
|
|
|
15a2072 |
@@ -51,6 +51,7 @@
|
|
|
15a2072 |
#include <grub/memory.h>
|
|
|
15a2072 |
#include <grub/i18n.h>
|
|
|
15a2072 |
#include <grub/efi/sb.h>
|
|
|
15a2072 |
+#include <grub/tpm.h>
|
|
|
15a2072 |
|
|
|
15a2072 |
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
15a2072 |
|
|
|
15a2072 |
@@ -440,6 +441,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
|
|
|
15a2072 |
}
|
|
|
15a2072 |
|
|
|
15a2072 |
grub_file_close (file);
|
|
|
15a2072 |
+ grub_tpm_measure (module, size, GRUB_KERNEL_PCR, argv[0]);
|
|
|
15a2072 |
return GRUB_ERR_NONE;
|
|
|
15a2072 |
}
|
|
|
15a2072 |
|
|
|
15a2072 |
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
|
|
|
15a2072 |
index 4df6595954d..d5ad02a33a1 100644
|
|
|
15a2072 |
--- a/grub-core/loader/multiboot_mbi2.c
|
|
|
15a2072 |
+++ b/grub-core/loader/multiboot_mbi2.c
|
|
|
15a2072 |
@@ -36,6 +36,7 @@
|
|
|
15a2072 |
#include <grub/i18n.h>
|
|
|
15a2072 |
#include <grub/net.h>
|
|
|
15a2072 |
#include <grub/lib/cmdline.h>
|
|
|
15a2072 |
+#include <grub/tpm.h>
|
|
|
15a2072 |
|
|
|
15a2072 |
#if defined (GRUB_MACHINE_EFI)
|
|
|
15a2072 |
#include <grub/efi/efi.h>
|
|
|
15a2072 |
@@ -131,8 +132,9 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
|
|
|
15a2072 |
|
|
|
15a2072 |
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);
|
|
|
15a2072 |
|
|
|
15a2072 |
+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename);
|
|
|
15a2072 |
+
|
|
|
15a2072 |
header = find_header (mld.buffer, len);
|
|
|
15a2072 |
-
|
|
|
15a2072 |
if (header == 0)
|
|
|
15a2072 |
{
|
|
|
15a2072 |
grub_free (mld.buffer);
|