]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.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)
committerPaolo Pisati <paolo.pisati@canonical.com>
Wed, 9 Mar 2022 14:17:54 +0000 (15:17 +0100)
commit3df183b9ef37faff45f48a87415597df797d64bc
treeb1ff4e54885cb12070772079adf7c965fbb1e5f6
parent23139372b214010f4ee4f2bc6ce6f712664a2281
efivars: Respect "block" flag in efivar_entry_set_safe()

BugLink: https://bugs.launchpad.net/bugs/1964361
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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/firmware/efi/vars.c