mirrors/sprout
1
0
Fork 0
mirror of https://github.com/edera-dev/sprout.git synced 2025-12-19 13:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(shim): handle hook uninstallation more gracefully

Browse Source
This commit is contained in:
Alex Zenla
2025-11-01 01:07:37 -04:00
parent eace74a6b0
commit 0bee93b607
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/integrations/shim.rs
View File

@@ -3,6 +3,7 @@ use crate::utils;
use crate::utils::ResolvedPath; use crate::utils::ResolvedPath;
use crate::utils::variables::VariableController; use crate::utils::variables::VariableController;
use anyhow::{Context, Result, anyhow, bail}; use anyhow::{Context, Result, anyhow, bail};
use log::warn;
use std::ffi::c_void; use std::ffi::c_void;
use uefi::Handle; use uefi::Handle;
use uefi::boot::LoadImageSource; use uefi::boot::LoadImageSource;
@@ -231,11 +232,11 @@ impl ShimSupport {
// If the security hook is required, we will bail for now. // If the security hook is required, we will bail for now.
if requires_security_hook { if requires_security_hook {
// Install the security hook, if possible. If it's not, this is necessary to continue // Install the security hook, if possible. If it's not, this is necessary to continue,
// so we should bail. // so we should bail.
let installed = SecurityHook::install().context("unable to install security hook")?; let installed = SecurityHook::install().context("unable to install security hook")?;
if !installed { if !installed {
bail!("unable to install security hook require for this platform"); bail!("unable to install security hook required for this platform");
} }
} }
@@ -262,7 +263,17 @@ impl ShimSupport {
// If the security override is required, we will uninstall the security hook. // If the security override is required, we will uninstall the security hook.
if requires_security_hook { if requires_security_hook {
SecurityHook::uninstall().context("unable to uninstall security hook")?; let uninstall_result = SecurityHook::uninstall();
// Ensure we don't mask load image errors if uninstalling fails.
if result.is_err()
&& let Err(uninstall_error) = &uninstall_result
{
// Warn on the error since the load image error is more important.
warn!("unable to uninstall security hook: {}", uninstall_error);
} else {
// Otherwise, ensure we handle the original uninstallation result.
uninstall_result?;
}
} }
result result
} }