diff options
| author | Gary Lin <glin@suse.com> | 2018-05-11 16:59:03 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2020-07-23 20:51:18 -0400 |
| commit | 85c837d67fef9cd831a3126398ed8da1421f61c5 (patch) | |
| tree | 5c4c9c412cc6f2646d92be362b2130e8f0b34e7e | |
| parent | 409b59af29b8749207a527c91dccba7eee98232b (diff) | |
| download | efi-boot-shim-85c837d67fef9cd831a3126398ed8da1421f61c5.tar.gz efi-boot-shim-85c837d67fef9cd831a3126398ed8da1421f61c5.zip | |
MokManager: Stop using EFI_VARIABLE_APPEND_WRITE
When writing MokList with EFI_VARIABLE_APPEND_WRITE, some HP laptops
may just return EFI_SUCCESS without writing the content into the flash,
so we have no way to detect if MokList is updated or not. Now we always
read MokList first and write it back with the new content.
https://github.com/rhboot/shim/issues/105
Signed-off-by: Gary Lin <glin@suse.com>
Upstream-commit-id: f442c8424b4
| -rw-r--r-- | MokManager.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/MokManager.c b/MokManager.c index 0767e4a6..df9b6fe6 100644 --- a/MokManager.c +++ b/MokManager.c @@ -880,14 +880,9 @@ static EFI_STATUS write_db(CHAR16 * db_name, void *MokNew, UINTN MokNewSize) UINTN old_size; UINTN new_size; - efi_status = gRT->SetVariable(db_name, &SHIM_LOCK_GUID, - EFI_VARIABLE_NON_VOLATILE | - EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_APPEND_WRITE, - MokNewSize, MokNew); - if (!EFI_ERROR(efi_status) || efi_status != EFI_INVALID_PARAMETER) { - return efi_status; - } + /* Do not use EFI_VARIABLE_APPEND_WRITE due to faulty firmwares. + * ref: https://github.com/rhboot/shim/issues/55 + * https://github.com/rhboot/shim/issues/105 */ efi_status = get_variable_attr(db_name, (UINT8 **)&old_data, &old_size, SHIM_LOCK_GUID, &attributes); |