summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2021-04-08 22:39:02 -0700
committerPeter Jones <pjones@redhat.com>2021-04-09 13:58:25 -0400
commit822d07ad4f07ef66fe447a130e1027c88d02a394 (patch)
tree859ccc61f4f998fe1e801aa3764ec5905f881a7a
parent20e4d9486fcae54ee44d2323ae342ffe68c920e6 (diff)
downloadefi-boot-shim-822d07ad4f07ef66fe447a130e1027c88d02a394.tar.gz
efi-boot-shim-822d07ad4f07ef66fe447a130e1027c88d02a394.zip
Fix handling of ignore_db and user_insecure_mode
In 65be350308783a8ef537246c8ad0545b4e6ad069, import_mok_state() is split up into a function that manages the whole mok state, and one that handles the state machine for an individual state variable. Unfortunately, the code that initializes the global ignore_db and user_insecure_mode was copied from import_mok_state() into the new import_one_mok_state() function, and thus re-initializes that state each time it processes a MoK state variable, before even assessing if that variable is set. As a result, we never honor either flag, and the machine owner cannot disable trusting the system firmware's db/dbx databases or disable validation altogether. This patch removes the extra re-initialization, allowing those variables to be set properly. Signed-off-by: Adam Williamson <awilliam@redhat.com>
-rw-r--r--mok.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mok.c b/mok.c
index 5ad9072b..9e37d6ab 100644
--- a/mok.c
+++ b/mok.c
@@ -888,9 +888,6 @@ EFI_STATUS import_one_mok_state(struct mok_state_variable *v,
EFI_STATUS ret = EFI_SUCCESS;
EFI_STATUS efi_status;
- user_insecure_mode = 0;
- ignore_db = 0;
-
UINT32 attrs = 0;
BOOLEAN delete = FALSE;