Remove expect from hyperlight-host

Signed-off-by: Simon Davies <[email protected]>

Author: simongdavies

src/hyperlight_host/src/hypervisor/surrogate_process_manager.rs

@@ -23,7 +23,7 @@ use std::path::{Path, PathBuf};
 use crossbeam_channel::{unbounded, Receiver, Sender};
 use hyperlight_common::mem::PAGE_SIZE_USIZE;
 use rust_embed::RustEmbed;
-use tracing::{info, instrument, Span};
+use tracing::{error, info, instrument, Span};
 use windows::core::{s, PCSTR};
 use windows::Win32::Foundation::HANDLE;
 use windows::Win32::Security::SECURITY_ATTRIBUTES;
@@ -251,13 +251,16 @@ impl Drop for SurrogateProcessManager {
     #[instrument(skip_all, parent = Span::current(), level= "Trace")]
     fn drop(&mut self) {
         let handle: HANDLE = self.job_handle.into();
-        unsafe {
+        if unsafe {
             // Terminating the job object will terminate all the surrogate
             // processes.
 
             TerminateJobObject(handle, 0)
         }
-        .expect("surrogate job objects were not all terminated error:");
+        .is_err()
+        {
+            error!("surrogate job objects were not all terminated");
+        }
     }
 }
 

src/hyperlight_host/src/lib.rs

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#![cfg_attr(not(any(test, debug_assertions)), warn(clippy::expect_used))]
+
 use std::sync::Once;
 
 /// This crate contains an SDK that is used to execute specially-

src/hyperlight_host/src/mem/pe/base_relocations.rs

@@ -132,9 +132,10 @@ pub(super) fn get_base_relocations(
         // Process each block of relocations until we have processed the expected amount of relocation data
         while size_processed < table_size {
             // Read the header for the block, which is the same format as a DataDirectory so I'm reusing its parse function
-            let block_header =
-                goblin::pe::data_directories::DataDirectory::parse(payload, &mut next_block_offset)
-                    .expect("oops");
+            let block_header = goblin::pe::data_directories::DataDirectory::parse(
+                payload,
+                &mut next_block_offset,
+            )?;
             // All relocation blocks in a page contain offsets against this address
             let page_virtual_address = block_header.virtual_address;
 

src/hyperlight_host/src/mem/pe/pe_info.rs

@@ -67,10 +67,10 @@ impl PEInfo {
             log_then_return!("unsupported PE file, not an executable image")
         }
 
-        let optional_header = pe
-            .header
-            .optional_header
-            .expect("unsupported PE file, missing optional header entry");
+        let optional_header = match pe.header.optional_header {
+            Some(optional_header) => optional_header,
+            None => log_then_return!("unsupported PE file, no optional header found"),
+        };
 
         // check that the PE file was built with the option /DYNAMICBASE
 
@@ -117,10 +117,10 @@ impl PEInfo {
                 // we are going to take care of the data section
                 if name == ".data" {
                     // Make sure we fail if we enter this block more than once
-                    assert_eq!(
-                        data_section_additional_bytes, 0,
-                        "Hyperlight currently only supports one .data section"
-                    );
+
+                    if data_section_additional_bytes > 0 {
+                        log_then_return!("Hyperlight currently only supports one .data section")
+                    }
 
                     data_section_raw_pointer = section.pointer_to_raw_data;
                     data_section_additional_bytes = virtual_size - raw_size;
@@ -251,8 +251,7 @@ impl PEInfo {
             }
 
             cur.set_position(patch.offset as u64);
-            cur.write_all(&patch.relocated_virtual_address.to_le_bytes())
-                .expect("failed to write patch to pe file contents");
+            cur.write_all(&patch.relocated_virtual_address.to_le_bytes())?;
             applied += 1;
         }
 
@@ -279,8 +278,7 @@ impl PEInfo {
         }
 
         let relocations =
-            base_relocations::get_base_relocations(&self.payload, &self.reloc_section)
-                .expect("error parsing base relocations");
+            base_relocations::get_base_relocations(&self.payload, &self.reloc_section)?;
         let mut patches = Vec::with_capacity(relocations.len());
 
         for reloc in relocations {