Commit 075e1a0c authored Jan 11, 2019 by Petr Mladek Committed by Greg Kroah-Hartman Jan 22, 2019

sysrq: Restore original console_loglevel when sysrq disabled



The sysrq header line is printed with an increased loglevel
to provide users some positive feedback.

The original loglevel is not restored when the sysrq operation
is disabled. This bug was introduced in 2.6.12 (pre-git-history)
by the commit ("Allow admin to enable only some of the Magic-Sysrq
functions").

Signed-off-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 46dd6d77

drivers/tty/sysrq.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,7 @@ void __handle_sysrq(int key, bool check_mask)
		op_p->handler(key);
		} else {
		pr_cont("This sysrq operation is disabled.\n");
		console_loglevel = orig_log_level;
		}
		} else {
		pr_cont("HELP : ");

Admin message