Subject: [merged] pstore-skip-zero-size-persistent-ram-buffer-in-traverse.patch removed from -mm tree
To: shuox.liu@xxxxxxxxx,ccross@xxxxxxxxxxx,keescook@xxxxxxxxxxxx,tony.luck@xxxxxxxxx,yanmin_zhang@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 20 Mar 2014 12:42:46 -0700
The patch titled
Subject: pstore: skip zero size persistent ram buffer in traverse
has been removed from the -mm tree. Its filename was
pstore-skip-zero-size-persistent-ram-buffer-in-traverse.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Liu ShuoX <shuox.liu@xxxxxxxxx>
Subject: pstore: skip zero size persistent ram buffer in traverse
In ramoops_pstore_read, a valid prz pointer with zero size buffer will
break traverse of all persistent ram buffers. The latter buffer might be
lost.
Signed-off-by: Liu ShuoX <shuox.liu@xxxxxxxxx>
Cc: "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx>
Cc: Colin Cross <ccross@xxxxxxxxxxx>
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/pstore/ram.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/pstore/ram.c~pstore-skip-zero-size-persistent-ram-buffer-in-traverse fs/pstore/ram.c
--- a/fs/pstore/ram.c~pstore-skip-zero-size-persistent-ram-buffer-in-traverse
+++ a/fs/pstore/ram.c
@@ -120,12 +120,12 @@ ramoops_get_next_prz(struct persistent_r
prz = przs[i];
- if (update) {
- /* Update old/shadowed buffer. */
+ /* Update old/shadowed buffer. */
+ if (update)
persistent_ram_save_old(prz);
- if (!persistent_ram_old_size(prz))
- return NULL;
- }
+
+ if (!persistent_ram_old_size(prz))
+ return NULL;
*typep = type;
*id = i;
_
Patches currently in -mm which might be from shuox.liu@xxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
