diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-05-06 08:29:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-06 08:30:24 +0200 |
commit | c102cb097d9371c2c60049d041ab1f8bdca5ccc2 (patch) | |
tree | c65201412507121fc7d53cb49590b0b8cde1a3a3 /fs | |
parent | de71ad2c97862eae1516aa36528cc3b317c17b2f (diff) | |
parent | d67e199611b986b345ea3087ee2e4a15da1c98b3 (diff) | |
download | linux-stable-c102cb097d9371c2c60049d041ab1f8bdca5ccc2.tar.gz linux-stable-c102cb097d9371c2c60049d041ab1f8bdca5ccc2.tar.bz2 linux-stable-c102cb097d9371c2c60049d041ab1f8bdca5ccc2.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
* Avoid garbage names in efivarfs due to buggy firmware by zeroing
EFI variable name. (Ross Lagerwall)
* Stop erroneously dropping upper 32 bits of boot command line pointer
in EFI boot stub and stash them in ext_cmd_line_ptr. (Roy Franz)
* Fix double-free bug in error handling code path of EFI runtime map
code. (Dan Carpenter)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/efivarfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c index ddbce42548c9..acf9a67f6770 100644 --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -121,7 +121,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, int len, i; int err = -ENOMEM; - entry = kmalloc(sizeof(*entry), GFP_KERNEL); + entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (!entry) return err; |