aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenny Szubowicz <lszubowi@redhat.com>2013-06-28 16:14:11 -0400
committerMark Brown <broonie@linaro.org>2014-06-16 21:14:30 +0100
commitbb0145e4e0e6f8112464975795850b3ce00c24f7 (patch)
tree769879961de52389af7357688d8d6bff9a0e87dc
parent01bcc35baaa09d0dc8ac6f90dfe5b90e0efaa6f9 (diff)
downloadlinux-linaro-stable-bb0145e4e0e6f8112464975795850b3ce00c24f7.tar.gz
efivars: If pstore_register fails, free unneeded pstore buffer
This is patch 3/3 of a patch set that cleans up pstore_register failure paths. If efivars fails to register with pstore, there is no point to keeping the 4 KB buffer around. It's only used by the pstore read/write routines. Signed-off-by: Lenny Szubowicz <lszubowi@redhat.com> Reported-by: Naotaka Hamaguchi <n.hamaguchi@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com> (cherry picked from commit 0d838347f1325cebfe8b9341a4b4c1f407022231) Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/firmware/efi/efi-pstore.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index c692bb662178..91864ad200ff 100644
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -235,7 +235,11 @@ static __init int efivars_pstore_init(void)
efi_pstore_info.bufsize = 1024;
spin_lock_init(&efi_pstore_info.buf_lock);
- pstore_register(&efi_pstore_info);
+ if (pstore_register(&efi_pstore_info)) {
+ kfree(efi_pstore_info.buf);
+ efi_pstore_info.buf = NULL;
+ efi_pstore_info.bufsize = 0;
+ }
return 0;
}