From: Liu ShuoX <shuox.liu@intel.com>
To: linux-kernel@vger.kernel.org
Cc: anton@enomsg.org, ccross@android.com, keescook@chromium.org,
tony.luck@intel.com, yanmin_zhang@linux.intel.com
Subject: [PATCH 1/2] pstore: fix NULL pointer fault if get NULL prz in ramoops_get_next_prz
Date: Tue, 11 Mar 2014 14:15:19 +0800 [thread overview]
Message-ID: <20140311061519.GA11552@lskakaxi-intel> (raw)
These two patches are applied on top of patches:
https://lkml.org/lkml/2014/3/3/368
It has been added in -mm tree. Below is the first patch, and i will
send the second by replying this one.
From: Liu ShuoX <shuox.liu@intel.com>
ramoops_get_next_prz get the prz according the paramters. If it get a
uninitialized prz, access its members by following persistent_ram_old_size(prz)
will cause a NULL pointer crash.
Ex: if ftrace_size is 0, fprz will be NULL.
Fix it by return NULL in advance.
Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
---
fs/pstore/ram.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 1daed28..6f96d8c 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -119,6 +119,8 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,
return NULL;
prz = przs[i];
+ if (!prz)
+ return NULL;
/* Update old/shadowed buffer. */
if (update)
--
1.8.3.2
next reply other threads:[~2014-03-11 6:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 6:15 Liu ShuoX [this message]
2014-03-11 6:17 ` [PATCH 2/2] pstore: correct the max_dump_cnt clearing of ramoops Liu ShuoX
2014-03-11 20:37 ` Kees Cook
2014-03-12 9:48 ` Liu ShuoX
2014-03-12 14:55 ` Kees Cook
2014-03-11 20:30 ` [PATCH 1/2] pstore: fix NULL pointer fault if get NULL prz in ramoops_get_next_prz Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140311061519.GA11552@lskakaxi-intel \
--to=shuox.liu@intel.com \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=yanmin_zhang@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®