efi: efivars: Fix variable writes without query_variable_store()
authorArd Biesheuvel <ardb@kernel.org>
Wed, 19 Oct 2022 21:29:58 +0000 (23:29 +0200)
committerArd Biesheuvel <ardb@kernel.org>
Fri, 21 Oct 2022 09:09:40 +0000 (11:09 +0200)
commit8a254d90a77580244ec57e82bca7eb65656cc167
tree070e9b3229edbf81b724c919be3e0d8b10e79ca2
parent4b017e59f01097f19b938f6dc4dc2c4720701610
efi: efivars: Fix variable writes without query_variable_store()

Commit bbc6d2c6ef22 ("efi: vars: Switch to new wrapper layer")
refactored the efivars layer so that the 'business logic' related to
which UEFI variables affect the boot flow in which way could be moved
out of it, and into the efivarfs driver.

This inadvertently broke setting variables on firmware implementations
that lack the QueryVariableInfo() boot service, because we no longer
tolerate a EFI_UNSUPPORTED result from check_var_size() when calling
efivar_entry_set_get_size(), which now ends up calling check_var_size()
a second time inadvertently.

If QueryVariableInfo() is missing, we support writes of up to 64k -
let's move that logic into check_var_size(), and drop the redundant
call.

Cc: <stable@vger.kernel.org> # v6.0
Fixes: bbc6d2c6ef22 ("efi: vars: Switch to new wrapper layer")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
drivers/firmware/efi/vars.c
fs/efivarfs/vars.c
include/linux/efi.h