summaryrefslogtreecommitdiffstats
path: root/fs/pstore/ram.c
diff options
context:
space:
mode:
authorPeng Wang <wangpeng15@xiaomi.com>2018-10-30 15:52:34 +0800
committerKees Cook <keescook@chromium.org>2018-12-03 16:52:35 -0800
commit7684bd334d9d4ca4f09873e88d9c0131a2cf6c3b (patch)
tree2ccb5d56ff8945abd6d2a85bb70e8804ba6bef9c /fs/pstore/ram.c
parentb77fa617a2ff4d6beccad3d3d4b3a1f2d10368aa (diff)
downloadlinux-7684bd334d9d4ca4f09873e88d9c0131a2cf6c3b.tar.gz
linux-7684bd334d9d4ca4f09873e88d9c0131a2cf6c3b.tar.bz2
linux-7684bd334d9d4ca4f09873e88d9c0131a2cf6c3b.zip
pstore: Avoid duplicate call of persistent_ram_zap()
When initialing a prz, if invalid data is found (no PERSISTENT_RAM_SIG), the function call path looks like this: ramoops_init_prz -> persistent_ram_new -> persistent_ram_post_init -> persistent_ram_zap persistent_ram_zap As we can see, persistent_ram_zap() is called twice. We can avoid this by adding an option to persistent_ram_new(), and only call persistent_ram_zap() when it is needed. Signed-off-by: Peng Wang <wangpeng15@xiaomi.com> [kees: minor tweak to exit path and commit log] Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs/pstore/ram.c')
-rw-r--r--fs/pstore/ram.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index e02a9039b5ea..768759841491 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -640,7 +640,7 @@ static int ramoops_init_prz(const char *name,
label = kasprintf(GFP_KERNEL, "ramoops:%s", name);
*prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info,
- cxt->memtype, 0, label);
+ cxt->memtype, PRZ_FLAG_ZAP_OLD, label);
if (IS_ERR(*prz)) {
int err = PTR_ERR(*prz);
@@ -649,8 +649,6 @@ static int ramoops_init_prz(const char *name,
return err;
}
- persistent_ram_zap(*prz);
-
*paddr += sz;
return 0;