pstore: Make sure console capturing will restart (b7753fc7) · Commits · 戴 / test

The CON_ENABLED flag gets cleared during unregister_console(), so make sure we already reset the console flags before calling register_console(), otherwise unloading and reloading a pstore backend will not restart console logging. Signed-off-by:

Kees Cook <keescook@chromium.org>

fs/pstore/platform.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -516,12 +516,16 @@ static void pstore_console_write(struct console con, const char s, unsigned c)
		static struct console pstore_console = {
		.name = "pstore",
		.write = pstore_console_write,
		.flags = CON_PRINTBUFFER \| CON_ENABLED \| CON_ANYTIME,
		.index = -1,
		};

		static void pstore_register_console(void)
		{
		/*
		* Always initialize flags here since prior unregister_console()
		* calls may have changed settings (specifically CON_ENABLED).
		*/
		pstore_console.flags = CON_PRINTBUFFER \| CON_ENABLED \| CON_ANYTIME;
		register_console(&pstore_console);
		}

Admin message