mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Garrett <mjg59@coreos.com>
|
|
Date: Tue, 1 Sep 2015 16:02:55 -0700
|
|
Subject: [PATCH] Measure multiboot images and modules
|
|
|
|
---
|
|
grub-core/loader/i386/multiboot_mbi.c | 3 +++
|
|
grub-core/loader/multiboot.c | 2 ++
|
|
grub-core/loader/multiboot_mbi2.c | 4 +++-
|
|
3 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
|
|
index dc98dbcae25..1c5b0ac25ce 100644
|
|
--- a/grub-core/loader/i386/multiboot_mbi.c
|
|
+++ b/grub-core/loader/i386/multiboot_mbi.c
|
|
@@ -36,6 +36,7 @@
|
|
#include <grub/net.h>
|
|
#include <grub/i18n.h>
|
|
#include <grub/lib/cmdline.h>
|
|
+#include <grub/tpm.h>
|
|
|
|
#ifdef GRUB_MACHINE_EFI
|
|
#include <grub/efi/efi.h>
|
|
@@ -173,6 +174,8 @@ grub_multiboot_load (grub_file_t file, const char *filename)
|
|
return grub_errno;
|
|
}
|
|
|
|
+ grub_tpm_measure((unsigned char*)buffer, len, GRUB_KERNEL_PCR, filename);
|
|
+
|
|
header = find_header (buffer, len);
|
|
|
|
if (header == 0)
|
|
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
|
|
index 26df46a4161..93e026c53db 100644
|
|
--- a/grub-core/loader/multiboot.c
|
|
+++ b/grub-core/loader/multiboot.c
|
|
@@ -51,6 +51,7 @@
|
|
#include <grub/memory.h>
|
|
#include <grub/i18n.h>
|
|
#include <grub/efi/sb.h>
|
|
+#include <grub/tpm.h>
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
@@ -440,6 +441,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
|
|
}
|
|
|
|
grub_file_close (file);
|
|
+ grub_tpm_measure (module, size, GRUB_KERNEL_PCR, argv[0]);
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
|
|
index 4df6595954d..d5ad02a33a1 100644
|
|
--- a/grub-core/loader/multiboot_mbi2.c
|
|
+++ b/grub-core/loader/multiboot_mbi2.c
|
|
@@ -36,6 +36,7 @@
|
|
#include <grub/i18n.h>
|
|
#include <grub/net.h>
|
|
#include <grub/lib/cmdline.h>
|
|
+#include <grub/tpm.h>
|
|
|
|
#if defined (GRUB_MACHINE_EFI)
|
|
#include <grub/efi/efi.h>
|
|
@@ -131,8 +132,9 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
|
|
|
|
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);
|
|
|
|
+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename);
|
|
+
|
|
header = find_header (mld.buffer, len);
|
|
-
|
|
if (header == 0)
|
|
{
|
|
grub_free (mld.buffer);
|