3e026f665c
- Add safety measure to pcr snapshot by checking platform and tpm status * safe_tpm_pcr_snapshot.patch - Fix installation failure due to unavailable nvram device on ppc64le (bsc#1201361) * 0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch - Add patches to dynamically allocate additional memory regions for EFI systems (bsc#1202438) * 0001-mm-Allow-dynamically-requesting-additional-memory-re.patch * 0002-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch * 0003-kern-efi-mm-Extract-function-to-add-memory-regions.patch * 0004-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch * 0005-kern-efi-mm-Implement-runtime-addition-of-pages.patch - Enlarge the default heap size and defer the disk cache invalidation (bsc#1202438) * 0001-kern-efi-mm-Enlarge-the-default-heap-size.patch * 0002-mm-Defer-the-disk-cache-invalidation.patch - Add patches for ALP FDE support * 0001-devmapper-getroot-Have-devmapper-recognize-LUKS2.patch * 0002-devmapper-getroot-Set-up-cheated-LUKS2-cryptodisk-mo.patch * 0003-disk-cryptodisk-When-cheatmounting-use-the-sector-in.patch * 0004-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch * 0005-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch * 0006-EFI-console-Do-not-set-colorstate-until-the-first-te.patch * 0007-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch * 0008-linuxefi-Use-common-grub_initrd_load.patch * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch * 0010-templates-import-etc-crypttab-to-grub.cfg.patch OBS-URL: https://build.opensuse.org/request/show/1004537 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=419
91 lines
2.2 KiB
Diff
91 lines
2.2 KiB
Diff
---
|
|
grub-core/commands/tpm.c | 28 ++++++++++++++++++++++------
|
|
util/grub-install.c | 7 +++++--
|
|
2 files changed, 27 insertions(+), 8 deletions(-)
|
|
|
|
--- a/grub-core/commands/tpm.c
|
|
+++ b/grub-core/commands/tpm.c
|
|
@@ -249,6 +249,8 @@
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
+#ifdef GRUB_MACHINE_EFI
|
|
+
|
|
static grub_err_t
|
|
grub_tpm_record_pcrs (grub_extcmd_context_t ctxt, int argc, char **args)
|
|
{
|
|
@@ -259,6 +261,10 @@
|
|
grub_size_t size = 0;
|
|
int n, rv = 1;
|
|
|
|
+ /* To prevent error: unable to read PCR from TPM, if no TPM device available */
|
|
+ if (!grub_tpm_present())
|
|
+ return GRUB_ERR_NONE;
|
|
+
|
|
if (argc == 0)
|
|
pcr_bitmask = GRUB2_PCR_BITMASK_DEFAULT;
|
|
else
|
|
@@ -287,13 +293,24 @@
|
|
return rv;
|
|
}
|
|
|
|
+#else
|
|
+
|
|
+static grub_err_t
|
|
+grub_tpm_record_pcrs (grub_extcmd_context_t ctxt __attribute__((unused)),
|
|
+ int argc __attribute__((unused)),
|
|
+ char **args __attribute__((unused)))
|
|
+{
|
|
+ return GRUB_ERR_NONE;
|
|
+}
|
|
+
|
|
+#endif
|
|
+
|
|
static grub_extcmd_t cmd;
|
|
|
|
GRUB_MOD_INIT (tpm)
|
|
{
|
|
- if (!grub_tpm_present())
|
|
- return;
|
|
- grub_verifier_register (&grub_tpm_verifier);
|
|
+ if (grub_tpm_present())
|
|
+ grub_verifier_register (&grub_tpm_verifier);
|
|
|
|
cmd = grub_register_extcmd ("tpm_record_pcrs", grub_tpm_record_pcrs, 0,
|
|
N_("LIST_OF_PCRS"),
|
|
@@ -303,8 +320,7 @@
|
|
|
|
GRUB_MOD_FINI (tpm)
|
|
{
|
|
- if (!grub_tpm_present())
|
|
- return;
|
|
- grub_verifier_unregister (&grub_tpm_verifier);
|
|
+ if (grub_tpm_present())
|
|
+ grub_verifier_unregister (&grub_tpm_verifier);
|
|
grub_unregister_extcmd (cmd);
|
|
}
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -1457,8 +1457,10 @@
|
|
|
|
grub_util_unlink (load_cfg);
|
|
|
|
- if (1)
|
|
+ /* FIXME: It seems config.is_cryptodisk_enabled is missing here */
|
|
+ if (platform == GRUB_INSTALL_PLATFORM_X86_64_EFI)
|
|
{
|
|
+ grub_install_push_module ("tpm");
|
|
load_cfg_f = grub_util_fopen (load_cfg, "wb");
|
|
have_load_cfg = 1;
|
|
fprintf (load_cfg_f, "tpm_record_pcrs 0-9\n");
|
|
@@ -1466,7 +1468,8 @@
|
|
|
|
if (debug_image && debug_image[0])
|
|
{
|
|
- load_cfg_f = grub_util_fopen (load_cfg, "wb");
|
|
+ if (!load_cfg_f)
|
|
+ load_cfg_f = grub_util_fopen (load_cfg, "wb");
|
|
have_load_cfg = 1;
|
|
fprintf (load_cfg_f, "set debug='%s'\n",
|
|
debug_image);
|