diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-05-22 19:58:57 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-05-22 19:58:57 +0200 |
| commit | 3979fdce77e6c2de97fa6c6f844ee76f001f4371 (patch) | |
| tree | c5e2a223fdc8d82595b8cdf4471d7c0589078e7d /arch/x86 | |
| parent | x86, range: fix missing merge during add range (diff) | |
| parent | x86, efi: initial the local variable of DataSize to zero (diff) | |
| download | linux-3979fdce77e6c2de97fa6c6f844ee76f001f4371.tar.xz linux-3979fdce77e6c2de97fa6c6f844ee76f001f4371.zip | |
Merge tag 'efi-urgent' into x86/urgent
* Avoid confusing the user by returning -EIO instead of -ENOENT in
efivarfs if an EFI variable gets deleted from under us and return EOF
when reading from a zero-length file - Lingzhu Xiang
* Fix an oops in efivar_update_sysfs_entries() caused by reusing (and
therefore corrupting) a kzalloc() allocation - Seiji Aguchi
* Initialise the DataSize argument to GetVariable() otherwise it will
not be updated with the actual size of the variable on return.
Discovered on a Acer Aspire V3 BIOS - Lee, Chun-Yi
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 55856b2310d3..82089d8b1954 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -206,7 +206,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size, } if (boot_used_size && !finished) { - unsigned long size; + unsigned long size = 0; u32 attr; efi_status_t s; void *tmp; |