From e2e8059df26a70a43796c60da25d3f4c6b2eb4a5 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Wed, 15 Nov 2023 05:24:59 +0100
Subject: [PATCH] stub(*): merge dynamically initrds

For dynamic usecases, e.g. credentials or system extension images, we have a need
for dynamic merging of initrds.
---
 rust/uefi/stub/src/fat.rs  | 15 +++++++++++++--
 rust/uefi/stub/src/thin.rs | 10 +++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/rust/uefi/stub/src/fat.rs b/rust/uefi/stub/src/fat.rs
index be6cc0a..4840244 100644
--- a/rust/uefi/stub/src/fat.rs
+++ b/rust/uefi/stub/src/fat.rs
@@ -51,7 +51,7 @@ pub fn boot_linux(
     // image and then parse the PE data structures from it. This is
     // safe, because we don't touch any data in the data sections that
     // might conceivably change while we look at the slice.
-    let config = unsafe {
+    let mut config = unsafe {
         EmbeddedConfiguration::new(
             booted_image_file(system_table.boot_services())
                 .unwrap()
@@ -67,5 +67,16 @@ pub fn boot_linux(
         secure_boot_enabled,
     );
 
-    boot_linux_unchecked(handle, system_table, config.kernel, &cmdline, config.initrd).status()
+    let mut final_initrd = Vec::new();
+    final_initrd.append(&mut config.initrd);
+
+    // Correctness: dynamic initrds are supposed to be validated by caller,
+    // i.e. they are system extension images or credentials
+    // that are supposedly measured in TPM2.
+    // Therefore, it is normal to not verify their hashes against a configuration.
+    for mut extra_initrd in dynamic_initrds {
+        final_initrd.append(&mut extra_initrd);
+    }
+
+    boot_linux_unchecked(handle, system_table, config.kernel, &cmdline, final_initrd).status()
 }
diff --git a/rust/uefi/stub/src/thin.rs b/rust/uefi/stub/src/thin.rs
index 5183b82..3817dad 100644
--- a/rust/uefi/stub/src/thin.rs
+++ b/rust/uefi/stub/src/thin.rs
@@ -99,7 +99,7 @@ pub fn boot_linux(
     let secure_boot_enabled = get_secure_boot_status(system_table.runtime_services());
 
     let kernel_data;
-    let initrd_data;
+    let mut initrd_data;
 
     {
         let file_system = system_table
@@ -135,5 +135,13 @@ pub fn boot_linux(
         secure_boot_enabled,
     )?;
 
+    // Correctness: dynamic initrds are supposed to be validated by caller,
+    // i.e. they are system extension images or credentials
+    // that are supposedly measured in TPM2.
+    // Therefore, it is normal to not verify their hashes against a configuration.
+    for mut extra_initrd in dynamic_initrds {
+        initrd_data.append(&mut extra_initrd);
+    }
+
     boot_linux_unchecked(handle, system_table, kernel_data, &cmdline, initrd_data)
 }