Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7791c842 authored by Richard Weinberger's avatar Richard Weinberger Committed by Matt Fleming
Browse files

x86,efi: Check max_size only if it is non-zero. 



Some EFI implementations return always a MaximumVariableSize of 0,
check against max_size only if it is non-zero.
My Intel DQ67SW desktop board has such an implementation.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent a6e4d5a0

arch/x86/platform/efi/efi.c

+6 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,12 @@ efi_status_t efi_query_variable_store(u32 attributes, unsigned long size) 
	if (status != EFI_SUCCESS)

		return status;



	if (!storage_size || size > remaining_size || size > max_size ||

	if (!max_size && remaining_size > size)

		printk_once(KERN_ERR FW_BUG "Broken EFI implementation"

			    " is returning MaxVariableSize=0\n");



	if (!storage_size || size > remaining_size ||

	    (max_size && size > max_size) ||

	    (remaining_size - size) < (storage_size / 2))

		return EFI_OUT_OF_RESOURCES;