]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
efivars: Respect "block" flag in efivar_entry_set_safe()
authorJann Horn <jannh@google.com>
Fri, 18 Feb 2022 18:05:59 +0000 (19:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Mar 2022 18:00:58 +0000 (19:00 +0100)
commitc2822d7b6751afdadbd23589164f1ed26cf369e0
treeef70a1dd01128f1bb4292176e957666cbf0437cb
parent8e3bc7c5bbf87e86e9cd652ca2a9166942d86206
efivars: Respect "block" flag in efivar_entry_set_safe()

commit 258dd902022cb10c83671176688074879517fd21 upstream.

When the "block" flag is false, the old code would sometimes still call
check_var_size(), which wrongly tells ->query_variable_store() that it can
block.

As far as I can tell, this can't really materialize as a bug at the moment,
because ->query_variable_store only does something on X86 with generic EFI,
and in that configuration we always take the efivar_entry_set_nonblocking()
path.

Fixes: ca0e30dcaa53 ("efi: Add nonblocking option to efi_query_variable_store()")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220218180559.1432559-1-jannh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/firmware/efi/vars.c