diff options
Diffstat (limited to 'src/image/efi_image.c')
| -rw-r--r-- | src/image/efi_image.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/image/efi_image.c b/src/image/efi_image.c index 42a724ee0..13f08de28 100644 --- a/src/image/efi_image.c +++ b/src/image/efi_image.c @@ -32,6 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/efi_pxe.h> #include <ipxe/efi/efi_driver.h> #include <ipxe/efi/efi_image.h> +#include <ipxe/efi/efi_shim.h> #include <ipxe/image.h> #include <ipxe/init.h> #include <ipxe/features.h> @@ -56,16 +57,6 @@ FEATURE ( FEATURE_IMAGE, "EFI", DHCP_EB_FEATURE_EFI, 1 ); "Could not start image" ) #define EEFI_START( efirc ) EPLATFORM ( EINFO_EEFI_START, efirc ) -/** EFI shim image */ -struct image_tag efi_shim __image_tag = { - .name = "SHIM", -}; - -/** EIF shim crutch image */ -struct image_tag efi_shim_crutch __image_tag = { - .name = "SHIMCRUTCH", -}; - /** * Create device path for image * @@ -165,6 +156,7 @@ static int efi_image_exec ( struct image *image ) { EFI_BOOT_SERVICES *bs = efi_systab->BootServices; struct efi_snp_device *snpdev; EFI_DEVICE_PATH_PROTOCOL *path; + struct efi_shim_unlocker unlocker; union { EFI_LOADED_IMAGE_PROTOCOL *image; void *interface; @@ -242,6 +234,14 @@ static int efi_image_exec ( struct image *image ) { goto err_cmdline; } + /* Install shim unlocker (if using a shim) */ + if ( shim && + ( ( rc = efi_shim_install ( &unlocker ) ) != 0 ) ) { + DBGC ( image, "EFIIMAGE %s could not install shim unlocker: " + "%s\n", image->name, strerror ( rc ) ); + goto err_shim_install; + } + /* Attempt loading image */ handle = NULL; if ( ( efirc = bs->LoadImage ( FALSE, efi_image_handle, path, @@ -336,6 +336,9 @@ static int efi_image_exec ( struct image *image ) { if ( rc != 0 ) bs->UnloadImage ( handle ); err_load_image: + if ( shim ) + efi_shim_uninstall ( &unlocker ); + err_shim_install: free ( cmdline ); err_cmdline: free ( path ); |