Merge pull request #244 from phip1611/improvements

linux_loader: improve code quality + bug fix

rust/uefi/linux-bootloader/src/linux_loader.rs

@@ -66,24 +66,20 @@ struct LoadFile2Protocol {
 impl LoadFile2Protocol {
     fn load_file(
         &mut self,
-        _file_path: *const FfiDevicePath,
+        _file_path: Option<&FfiDevicePath>,
         _boot_policy: bool,
-        buffer_size: *mut usize,
+        buffer_size: Option<&mut usize>,
-        buffer: *mut c_void,
+        buffer: *mut u8,
     ) -> Result<()> {
-        if buffer.is_null() || unsafe { *buffer_size } < self.initrd_data.len() {
+        let buffer_size = buffer_size.ok_or(uefi::Error::new(Status::INVALID_PARAMETER, ()))?;
-            unsafe {
+        if buffer.is_null() || *buffer_size < self.initrd_data.len() {
+            // Give the caller a hint for the right buffer size.
             *buffer_size = self.initrd_data.len();
-            }
             return Err(Status::BUFFER_TOO_SMALL.into());
-        };
-
-        unsafe {
-            *buffer_size = self.initrd_data.len();
         }
 
         let output_slice: &mut [u8] =
-            unsafe { &mut *slice_from_raw_parts_mut(buffer as *mut u8, *buffer_size) };
+            unsafe { &mut *slice_from_raw_parts_mut(buffer, self.initrd_data.len()) };
 
         output_slice.copy_from_slice(&self.initrd_data);
 
@@ -98,7 +94,12 @@ unsafe extern "efiapi" fn raw_load_file(
     buffer_size: *mut usize,
     buffer: *mut c_void,
 ) -> Status {
-    this.load_file(file_path, boot_policy, buffer_size, buffer)
+    this.load_file(
+        file_path.as_ref(),
+        boot_policy,
+        buffer_size.as_mut(),
+        buffer.cast(),
+    )
     .status()
 }