This is a note to let you know that I've just added the patch titled
pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pstore-fix-null-pointer-fault-if-get-null-prz-in-ramoops_get_next_prz.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b0aa931fb84431394d995472d0af2a6c2b61064d Mon Sep 17 00:00:00 2001
From: Liu ShuoX <shuox.liu@xxxxxxxxx>
Date: Mon, 17 Mar 2014 13:57:49 -0700
Subject: pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz
From: Liu ShuoX <shuox.liu@xxxxxxxxx>
commit b0aa931fb84431394d995472d0af2a6c2b61064d upstream.
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@xxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
Cc: HuKeping <hukeping@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/pstore/ram.c | 2 ++
1 file changed, 2 insertions(+)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -125,6 +125,8 @@ ramoops_get_next_prz(struct persistent_r
return NULL;
prz = przs[i];
+ if (!prz)
+ return NULL;
/* Update old/shadowed buffer. */
if (update)
Patches currently in stable-queue which might be from shuox.liu@xxxxxxxxx are
queue-3.10/pstore-fix-null-pointer-fault-if-get-null-prz-in-ramoops_get_next_prz.patch
queue-3.10/pstore-clarify-clearing-of-_read_cnt-in-ramoops_context.patch
queue-3.10/pstore-skip-zero-size-persistent-ram-buffer-in-traverse.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html