Merge pull request #225 from 00xc/fw_meta/cpuid-page

fw_meta: do not panic on CPUID page absence
coconut-svsm · Jan 26, 2024 · 71bcc1d · 71bcc1d
2 parents 0328675 + b5ce98a
commit 71bcc1d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/src/fw_meta.rs b/src/fw_meta.rs
@@ -251,7 +251,8 @@ pub fn parse_fw_meta_data(mem: &[u8]) -> Result<SevFWMetaData, SvsmError> {
 
     // Verify that the required elements are present.
     if meta_data.cpuid_page.is_none() {
-        panic!("FW does not specify CPUID_PAGE location");
+        log::error!("FW does not specify CPUID_PAGE location");
+        return Err(SvsmError::Firmware);
     }
 
     Ok(meta_data)