mirrors/sprout
1
0
Fork 0
mirror of https://github.com/edera-dev/sprout.git synced 2026-02-04 08:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(eficore): unregister media loader on drop to prevent more opportunities for leaks (#50)

Browse Source
This commit is contained in:
Alex Zenla
2025-12-20 22:01:04 -08:00
committed by GitHub
parent 2da457ee7c
commit 17e729d068
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/boot/src/actions/chainload.rs
View File

@@ -10,7 +10,6 @@ use eficore::loader::source::ImageSource;
use eficore::loader::{ImageLoadRequest, ImageLoader};
use eficore::media_loader::MediaLoaderHandle;
use eficore::media_loader::constants::linux::LINUX_EFI_INITRD_MEDIA_GUID;
use log::error;
use uefi::CString16;
use uefi::proto::loaded_image::LoadedImage;
@@ -99,19 +98,15 @@ pub fn chainload(context: Rc<SproutContext>, configuration: &ChainloadConfigurat
// after the optional initrd has been unregistered.
let result = uefi::boot::start_image(*image.handle());
// Unregister the initrd if it was registered.
if let Some(initrd_handle) = initrd_handle
&& let Err(error) = initrd_handle.unregister()
{
error!("unable to unregister linux initrd: {}", error);
}
// Assert there was no error starting the image.
result.context("unable to start image")?;
// Explicitly drop the options to clarify the lifetime.
drop(options);
// Explicitly drop the initrd handle to clarify when it should be unregistered.
drop(initrd_handle);
// Return control to sprout.
Ok(())
}

11
crates/boot/src/actions/edera.rs
View File

@@ -15,7 +15,6 @@ use eficore::media_loader::{
XEN_EFI_CONFIG_MEDIA_GUID, XEN_EFI_KERNEL_MEDIA_GUID, XEN_EFI_RAMDISK_MEDIA_GUID,
},
};
use log::error;
use uefi::Guid;
/// Builds a configuration string for the Xen EFI stub using the specified `configuration`.
@@ -105,7 +104,7 @@ pub fn edera(context: Rc<SproutContext>, configuration: &EderaConfiguration) ->
)
.context("unable to register kernel media loader")?;
// Create a vector of media loaders to unregister on error.
// Create a vector of media loaders to drop them only after this function completes.
let mut media_loaders = vec![config, kernel];
// Register the initrd if it is provided.
@@ -127,12 +126,8 @@ pub fn edera(context: Rc<SproutContext>, configuration: &EderaConfiguration) ->
)
.context("unable to chainload to xen");
// Unregister the media loaders when an error happens.
for media_loader in media_loaders {
if let Err(error) = media_loader.unregister() {
error!("unable to unregister media loader: {}", error);
}
}
// Explicitly drop the media loaders to clarify when they should be unregistered.
drop(media_loaders);
result
}