File tboot-fix-memmap1-boot-issues.patch of Package tboot.18210

Overview Repositories Revisions Requests Users Attributes Meta

File tboot-fix-memmap1-boot-issues.patch of Package tboot.18210

# HG changeset patch
# User Lukasz Hawrylko <lukasz.hawrylko@intel.com>
# Date 1605276097 -3600
#      Fri Nov 13 15:01:37 2020 +0100
# Node ID 7aa308813590268f84ef4a29ce374aafe327b8ff
# Parent  51c15aee07de4ee89369a47938a6e0473640a748
Fix issue when booted with multiboot(1)

Signed-off-by: Lukasz Hawrylko <lukasz.hawrylko@intel.com>

diff -r 51c15aee07de -r 7aa308813590 tboot/common/loader.c
--- a/tboot/common/loader.c	2021-01-11 16:52:26.261695282 +0100
+++ b/tboot/common/loader.c	2021-01-11 16:53:25.101787064 +0100
@@ -2034,7 +2034,7 @@
 
     if (scr == NULL)
         return;
-    if (LOADER_CTX_BAD(lctx))
+    if (LOADER_CTX_BAD(lctx) || lctx->type != MB2_ONLY)
         return;
     start = (struct mb2_tag *)(lctx->addr + 8);
     start = find_mb2_tag_type(start, MB2_TAG_TYPE_FRAMEBUFFER);
changeset:   594:70cfdb32cebb
user:        Lukasz Hawrylko <lukasz.hawrylko@intel.com>
date:        Wed Jun 03 16:35:17 2020 +0200
summary:     Do not try to read EFI mem map when booted with multiboot(1)

diff -r 1f912c52b1cc -r 70cfdb32cebb tboot/common/loader.c
--- a/tboot/common/loader.c	Sat May 23 20:32:48 2020 +0300
+++ b/tboot/common/loader.c	Wed Jun 03 16:35:17 2020 +0200
@@ -1999,6 +1999,13 @@
     struct mb2_tag *start = NULL, *hit = NULL;
     struct mb2_tag_efi_mmap *efi_mmap = NULL;
 
+    if (LOADER_CTX_BAD(lctx) || lctx->type != MB2_ONLY) {
+        return 0;
+    }
+    if (descr_size == NULL || descr_vers == NULL || mmap_size == NULL) {
+        return 0;
+    }
+
     start = (struct mb2_tag *)(lctx->addr + 8);
     hit = find_mb2_tag_type(start, MB2_TAG_TYPE_EFI_MMAP);
     if (hit == NULL) {

Places

File tboot-fix-memmap1-boot-issues.patch of Package tboot.18210

Places