pstore: Avoid duplicate call of persistent_ram_zap()

Browse source

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>

...

This commit is contained in:

Peng Wang 2018-10-30 15:52:34 +08:00 • committed by Kees Cook

parent b77fa617a2

commit 7684bd334d

3 changed files with 11 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

fs/pstore/ram.c

View file

15

fs/pstore/ram_core.c

View file

1

include/linux/pstore_ram.h

View file