Hi guys,
This pull includes fixes for the merge window material currently sitting
in tip/x86/efi. The three patches from me fix bugs in the pstore code
paths and the two from Dan are the results of his static analysis tool,
including a fix for a locking bug.
The changes are based on my efi-for-tip2 branch. If you would like it
based on something else, just let me know.
The following changes since commit a614e1923d5389d01f3545ee4a90e39a04d0c90d:
Merge tag 'v3.9' into efi-for-tip2 (2013-04-30 11:42:13 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git efi-for-tip-fixes
for you to fetch changes up to 7b2dd6d2c4db3912771bfcfd7ac7264011a3c831:
efi: remove "kfree(NULL)" (2013-04-30 16:03:18 +0100)
----------------------------------------------------------------
Dan Carpenter (2):
efi: locking fix in efivar_entry_set_safe()
efi: remove "kfree(NULL)"
Matt Fleming (3):
efi, pstore: Initialise 'entry' before iterating
efi, pstore: Remove entry from list when erasing
efi, pstore: Read data from variable store before memcpy()
drivers/firmware/efi/efi-pstore.c | 10 +++++--
drivers/firmware/efi/efivars.c | 4 +--
drivers/firmware/efi/vars.c | 53 ++++++++++++++++++++-----------------
include/linux/efi.h | 3 ++-
4 files changed, 39 insertions(+), 31 deletions(-)
--
Matt Fleming, Intel Open Source Technology Center