Skip to content

Commit

Permalink
pstore: skip zero size persistent ram buffer in traverse
Browse files Browse the repository at this point in the history
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@intel.com>
Cc: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Cc: Colin Cross <ccross@android.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Liu ShuoX authored and Tony Luck committed Mar 17, 2014
1 parent 57fd835 commit aa9a4a1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fs/pstore/ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,

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;
Expand Down

0 comments on commit aa9a4a1

Please sign in to comment.