diff options
author | Liu ShuoX <shuox.liu@intel.com> | 2014-03-16 20:24:49 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2014-03-17 17:14:03 -0400 |
commit | aa9a4a1edfbd3d223af01db833da2f07850bc655 (patch) | |
tree | 3c131b8ea82a437d97439dfc3e607052fc8cfaff /fs/pstore | |
parent | 57fd835385a043577457a385f28c08be693991bf (diff) |
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@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>
Diffstat (limited to 'fs/pstore')
-rw-r--r-- | fs/pstore/ram.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 9fe5b13295e0..1daed280f1b6 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c | |||
@@ -120,12 +120,12 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max, | |||
120 | 120 | ||
121 | prz = przs[i]; | 121 | prz = przs[i]; |
122 | 122 | ||
123 | if (update) { | 123 | /* Update old/shadowed buffer. */ |
124 | /* Update old/shadowed buffer. */ | 124 | if (update) |
125 | persistent_ram_save_old(prz); | 125 | persistent_ram_save_old(prz); |
126 | if (!persistent_ram_old_size(prz)) | 126 | |
127 | return NULL; | 127 | if (!persistent_ram_old_size(prz)) |
128 | } | 128 | return NULL; |
129 | 129 | ||
130 | *typep = type; | 130 | *typep = type; |
131 | *id = i; | 131 | *id = i; |