diff options
| author | Liu ShuoX <shuox.liu@intel.com> | 2014-03-17 11:24:49 +1100 |
|---|---|---|
| committer | Tim Wang <wangtt@marvell.com> | 2015-03-16 17:28:29 +0800 |
| commit | bbec2685be7b468ca336139e22af128c5b50fa65 (patch) | |
| tree | ee717758e9f9c925d0d66d76aac8a6f6a6e4000d /fs | |
| parent | f5324bb6b4c7dfc4fbf82fad247d272d8b65b515 (diff) | |
| download | pxa-v3.14-bbec2685be7b468ca336139e22af128c5b50fa65.tar.gz | |
pstore: skip zero size persistent ram buffer in traverse
commit aa9a4a1edfbd3d223af01db833da2f07850bc655 upstream.
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>
Cc: HuKeping <hukeping@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -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 f22c7b3dfd2..acdbd0e96de 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -128,12 +128,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; |