diff options
| author | Petr Mladek <pmladek@suse.com> | 2019-01-11 13:45:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-05 16:42:15 +0100 |
| commit | a85451011c3203c00930860d453c18e57f9f4c52 (patch) | |
| tree | 9ad7ef623f205d064299c56baa0683ed1a091ce1 /drivers | |
| parent | 0fb31bd53a5e27394916758173eb748c5e0dbd47 (diff) | |
| download | linux-a85451011c3203c00930860d453c18e57f9f4c52.tar.gz linux-a85451011c3203c00930860d453c18e57f9f4c52.tar.bz2 linux-a85451011c3203c00930860d453c18e57f9f4c52.zip | |
sysrq: Restore original console_loglevel when sysrq disabled
commit 075e1a0c50f59ea210561d0d0fedbd945615df78 upstream.
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>
Cc: Tommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/sysrq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 06ed20dd01ba..4a45f55c96e8 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -560,6 +560,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 : "); |