min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unsafe LoadedImage protocol invocation

This commit is contained in:
Julian Stecklina 2022-11-23 11:20:51 +01:00
parent 5b414bd20b
commit 8f58633d84
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rust/lanzaboote/src/main.rs
View File

@ -42,21 +42,14 @@ fn print_logo(output: &mut Output) {
.unwrap();
}
fn image_file(boot_services: &BootServices, image: Handle) -> Result<RegularFile> {
let mut file_system = boot_services.get_image_file_system(image)?;
fn image_file(boot_services: &BootServices) -> Result<RegularFile> {
let mut file_system = boot_services.get_image_file_system(boot_services.image_handle())?;
// The root directory of the volume where our binary lies.
let mut root = file_system.open_volume()?;
let loaded_image = unsafe {
// XXX This gives ACCESS_DENIED if we use open_protocol_exclusive?
boot_services.open_protocol::<LoadedImage>(
OpenProtocolParams {
handle: image,
agent: image,
controller: None,
},
OpenProtocolAttributes::Exclusive,
)
}?;
let loaded_image =
boot_services.open_protocol_exclusive::<LoadedImage>(boot_services.image_handle())?;
let file_path = loaded_image.file_path().ok_or(Status::NOT_FOUND)?;
@ -87,7 +80,7 @@ fn main(handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
let boot_services = system_table.boot_services();
{
let image_data = read_all(&mut image_file(boot_services, handle).unwrap()).unwrap();
let image_data = read_all(&mut image_file(boot_services).unwrap()).unwrap();
if let Some(data) = pe_section(&image_data, ".osrel") {
info!("osrel = {}", core::str::from_utf8(data).unwrap_or("???"))