Merge tag 'efi-fixes-for-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel: - A pair of tweaks to the EFI random seed code so that externally provided version of this config table are handled more robustly - Another fix for the v6.0 EFI variable refactor that turned out to break Apple machines which don't provide QueryVariableInfo() - Add some guard rails to the EFI runtime service call wrapper so we can recover from synchronous exceptions caused by firmware * tag 'efi-fixes-for-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: arm64: efi: Recover from synchronous exceptions occurring in firmware efi: efivars: Fix variable writes with unsupported query_variable_store() efi: random: Use 'ACPI reclaim' memory for random seed efi: random: reduce seed size to 32 bytes efi/tpm: Pass correct address to memblock_reserve

Linus Torvalds committed 4 years ago

Commit 1caa2f12 parents 10d916c 23715a29 files · +98 −54Browse files

Showing the changes to include/linux (1 of 9 files). Show all

Unified · Split

include/linux/efi.h+1−1

@@ -1222,7 +1222,7 @@ efi_status_t efi_random_get_seed(void); · 1221 unmodified lines
1222	1222	arch_efi_call_virt_teardown(); \
1223	1223	})
1224	1224
1225		−#define EFI_RANDOM_SEED_SIZE 64U
	1225	+#define EFI_RANDOM_SEED_SIZE 32U // BLAKE2S_HASH_SIZE
1226	1226
1227	1227	struct linux_efi_random_seed {
1228	1228	u32 size;