diff options
| author | Richard Weinberger <richard@nod.at> | 2013-04-10 10:59:34 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-30 14:35:11 +0100 |
| commit | b12bcd7b3fe04a5fcca945aaf5b74181d9a223f4 (patch) | |
| tree | d88c65439b7be1c3eaa544e58f2ce347858011a9 /arch/x86/platform | |
| parent | c5ba30a73ebcca1b4068363ca08410fa3729ebeb (diff) | |
| download | kernel_samsung_smdk4412-b12bcd7b3fe04a5fcca945aaf5b74181d9a223f4.zip kernel_samsung_smdk4412-b12bcd7b3fe04a5fcca945aaf5b74181d9a223f4.tar.gz kernel_samsung_smdk4412-b12bcd7b3fe04a5fcca945aaf5b74181d9a223f4.tar.bz2 | |
x86,efi: Check max_size only if it is non-zero.
commit 7791c8423f1f7f4dad94e753bae67461d5b80be8 upstream.
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: Richard Weinberger <richard@nod.at>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a20b5b3..3d7bb05 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -834,7 +834,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; |