summaryrefslogtreecommitdiffstats
path: root/fs/pstore/platform.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 15:37:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 15:37:43 -0700
commit8e343c8b5c2e3c93d9eebea7702c89d81753c495 (patch)
treef17e98667b26c993383b5dabe66e6ace4ffc4794 /fs/pstore/platform.c
parent370d2662d569f22ac3d598cd4475617cd910c759 (diff)
parente32634f5d57f1dce88624b70a6d625915f6ea09e (diff)
downloadlinux-stable-8e343c8b5c2e3c93d9eebea7702c89d81753c495.tar.gz
linux-stable-8e343c8b5c2e3c93d9eebea7702c89d81753c495.tar.bz2
linux-stable-8e343c8b5c2e3c93d9eebea7702c89d81753c495.zip
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore fixes from Tony Luck: "Series of small bug fixes for pstore" * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: pstore: Fix memory leak when decompress using big_oops_buf pstore: Fix buffer overflow while write offset equal to buffer size pstore: Correct the max_dump_cnt clearing of ramoops pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz pstore: skip zero size persistent ram buffer in traverse pstore: clarify clearing of _read_cnt in ramoops_context
Diffstat (limited to 'fs/pstore/platform.c')
-rw-r--r--fs/pstore/platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 78c3c2097787..46d269e38706 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -497,6 +497,7 @@ void pstore_get_records(int quiet)
big_oops_buf_sz);
if (unzipped_len > 0) {
+ kfree(buf);
buf = big_oops_buf;
size = unzipped_len;
compressed = false;