author: Brian Norris <briannorris@chromium.org> 2017-02-08 22:44:44 -0800
committer: Kees Cook <keescook@chromium.org> 2017-02-09 11:49:49 -0800
commit: 8672aed7bd865774257efd40929702759a869329
parent: d966564fcdc19e13eb6ba1fbe6b8101070339c3d
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 27c059e1760a..1d887efaaf71 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -280,7 +280,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
1, id, type, PSTORE_TYPE_PMSG, 0);
/* ftrace is last since it may want to dynamically allocate memory. */
- if (!prz_ok(prz)) {
+ if (!prz_ok(prz) && cxt->fprzs) {
if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) {
prz = ramoops_get_next_prz(cxt->fprzs,
&cxt->ftrace_read_cnt, 1, id, type,