diff options
| author | Kees Cook <keescook@chromium.org> | 2020-05-08 09:26:28 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2020-05-30 10:34:02 -0700 |
| commit | d195c39052d1da278a00a6744ce59c383b67b191 (patch) | |
| tree | 602e153404b0da6cb4993664876fd1601aa63b4e | |
| parent | 563ca40ddf400dbf8c6254077f9b6887101d0f08 (diff) | |
| download | microwatt-d195c39052d1da278a00a6744ce59c383b67b191.tar.gz | |
pstore/platform: Use backend name for console registration
If the pstore backend changes, there's no indication in the logs what
the console is (it always says "pstore"). Instead, pass through the
active backend's name. (Also adjust the selftest to match.)
Link: https://lore.kernel.org/lkml/20200510202436.63222-5-keescook@chromium.org/
Link: https://lore.kernel.org/lkml/20200526135429.GQ12456@shao2-debian
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | fs/pstore/platform.c | 4 | ||||
| -rwxr-xr-x | tools/testing/selftests/pstore/pstore_tests | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 715396bef0eaba..e8690d8606e022 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -514,13 +514,15 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c) } static struct console pstore_console = { - .name = "pstore", .write = pstore_console_write, .index = -1, }; static void pstore_register_console(void) { + /* Show which backend is going to get console writes. */ + strscpy(pstore_console.name, psinfo->name, + sizeof(pstore_console.name)); /* * Always initialize flags here since prior unregister_console() * calls may have changed settings (specifically CON_ENABLED). diff --git a/tools/testing/selftests/pstore/pstore_tests b/tools/testing/selftests/pstore/pstore_tests index 1cef54458aff91..2aa9a3852a8420 100755 --- a/tools/testing/selftests/pstore/pstore_tests +++ b/tools/testing/selftests/pstore/pstore_tests @@ -10,7 +10,7 @@ . ./common_tests prlog -n "Checking pstore console is registered ... " -dmesg | grep -q "console \[pstore" +dmesg | grep -Eq "console \[(pstore|${backend})" show_result $? prlog -n "Checking /dev/pmsg0 exists ... " |