4.4-stable patches

added patches:
	sysrq-remove-duplicated-sysrq-message.patch
	sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index ebb0929581feba3ae58b3302d48b513416ce4c5d..993fe000b573a243079906a51e30d459e4fd03ee 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -8,3 +8,5 @@ cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch
 arm-ftrace-fix-be-text-poking.patch
 cifs-fix-mode-output-in-debugging-statements.patch
 cfg80211-add-missing-policy-for-nl80211_attr_status_.patch
+sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch
+sysrq-remove-duplicated-sysrq-message.patch

diff --git a/queue-4.4/sysrq-remove-duplicated-sysrq-message.patch b/queue-4.4/sysrq-remove-duplicated-sysrq-message.patch
new file mode 100644 (file)
index 0000000..6d04b2c
--- /dev/null
+++ b/queue-4.4/sysrq-remove-duplicated-sysrq-message.patch
@@ -0,0 +1,55 @@
+From c3fee60908db4a8594f2e4a2131998384b8fa006 Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek@suse.com>
+Date: Fri, 11 Jan 2019 17:20:37 +0100
+Subject: sysrq: Remove duplicated sysrq message
+
+From: Petr Mladek <pmladek@suse.com>
+
+commit c3fee60908db4a8594f2e4a2131998384b8fa006 upstream.
+
+The commit 97f5f0cd8cd0a0544 ("Input: implement SysRq as a separate input
+handler") added pr_fmt() definition. It caused a duplicated message
+prefix in the sysrq header messages, for example:
+
+[  177.053931] sysrq: SysRq : Show backtrace of all active CPUs
+[  742.864776] sysrq: SysRq : HELP : loglevel(0-9) reboot(b) crash(c)
+
+Fixes: 97f5f0cd8cd0a05 ("Input: implement SysRq as a separate input handler")
+Signed-off-by: Petr Mladek <pmladek@suse.com>
+Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Cc: Tommi Rantala  <tommi.t.rantala@nokia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/sysrq.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/drivers/tty/sysrq.c
++++ b/drivers/tty/sysrq.c
+@@ -542,7 +542,6 @@ void __handle_sysrq(int key, bool check_
+        */
+       orig_log_level = console_loglevel;
+       console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
+-      pr_info("SysRq : ");
+ 
+         op_p = __sysrq_get_key_op(key);
+         if (op_p) {
+@@ -551,15 +550,15 @@ void __handle_sysrq(int key, bool check_
+                * should not) and is the invoked operation enabled?
+                */
+               if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
+-                      pr_cont("%s\n", op_p->action_msg);
++                      pr_info("%s\n", op_p->action_msg);
+                       console_loglevel = orig_log_level;
+                       op_p->handler(key);
+               } else {
+-                      pr_cont("This sysrq operation is disabled.\n");
++                      pr_info("This sysrq operation is disabled.\n");
+                       console_loglevel = orig_log_level;
+               }
+       } else {
+-              pr_cont("HELP : ");
++              pr_info("HELP : ");
+               /* Only print the help msg once per handler */
+               for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
+                       if (sysrq_key_table[i]) {

diff --git a/queue-4.4/sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch b/queue-4.4/sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch
new file mode 100644 (file)
index 0000000..5d0ef26
--- /dev/null
+++ b/queue-4.4/sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch
@@ -0,0 +1,37 @@
+From 075e1a0c50f59ea210561d0d0fedbd945615df78 Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek@suse.com>
+Date: Fri, 11 Jan 2019 13:45:15 +0100
+Subject: sysrq: Restore original console_loglevel when sysrq disabled
+
+From: Petr Mladek <pmladek@suse.com>
+
+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>
+
+---
+ drivers/tty/sysrq.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/tty/sysrq.c
++++ b/drivers/tty/sysrq.c
+@@ -556,6 +556,7 @@ void __handle_sysrq(int key, bool check_
+                       op_p->handler(key);
+               } else {
+                       pr_cont("This sysrq operation is disabled.\n");
++                      console_loglevel = orig_log_level;
+               }
+       } else {
+               pr_cont("HELP : ");