From 07bda58596608f05bfa035a1cc5710f5ac8ea3d9 Mon Sep 17 00:00:00 2001 From: Ivan Hu Date: Tue, 22 Nov 2016 06:26:01 +0800 Subject: [PATCH] shim: fix the mirroring MokSBState fail Some machines have already embedded MokSBStateRT varaible with EFI_VARIABLE_NON_VOLATILE attribute, and some users might disable shim vailidation manually by creating MokSBStateRT. It causes mirroring MokSBState fail because the variable cannot be set with different attribute again, and gets error massage every time when booting. Fix it with checking the MokSBStateRT existence and deleting it before mirroring it. Signed-off-by: Ivan Hu --- shim.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/shim.c b/shim.c index cc3654e..52cf8a5 100644 --- a/shim.c +++ b/shim.c @@ -2022,18 +2022,32 @@ EFI_STATUS mirror_mok_sb_state() UINTN DataSize = 0; efi_status = get_variable(L"MokSBState", &Data, &DataSize, shim_lock_guid); - if (efi_status != EFI_SUCCESS) - return efi_status; + if (efi_status == EFI_SUCCESS) { + UINT8 *Data_RT = NULL; + UINTN DataSize_RT = 0; - efi_status = uefi_call_wrapper(RT->SetVariable, 5, L"MokSBStateRT", - &shim_lock_guid, - EFI_VARIABLE_BOOTSERVICE_ACCESS - | EFI_VARIABLE_RUNTIME_ACCESS, - DataSize, Data); - if (efi_status != EFI_SUCCESS) { - console_error(L"Failed to set MokSBStateRT", efi_status); + efi_status = get_variable(L"MokSBStateRT", &Data_RT, + &DataSize_RT, shim_lock_guid); + if (efi_status == EFI_SUCCESS) { + efi_status = uefi_call_wrapper(RT->SetVariable, 5, + L"MokSBStateRT", + &shim_lock_guid, + EFI_VARIABLE_BOOTSERVICE_ACCESS + | EFI_VARIABLE_RUNTIME_ACCESS + | EFI_VARIABLE_NON_VOLATILE, + 0, NULL); + } + + efi_status = uefi_call_wrapper(RT->SetVariable, 5, + L"MokSBStateRT", + &shim_lock_guid, + EFI_VARIABLE_BOOTSERVICE_ACCESS + | EFI_VARIABLE_RUNTIME_ACCESS, + DataSize, Data); + if (efi_status != EFI_SUCCESS) { + console_error(L"Failed to set MokSBStateRT", efi_status); + } } - return efi_status; }