linux-kernel - [PATCH] tty: only print sysrq help for handlers that are enabled

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1386086125-1865-1-git-send-email-shawn@churchofgit.com>
Date:	Tue,  3 Dec 2013 07:55:25 -0800
From:	Shawn Landden <shawn@...rchofgit.com>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Jiri Slaby <jslaby@...e.cz>
Cc:	linux-kernel@...r.kernel.org, Shawn Landden <shawn@...rchofgit.com>
Subject: [PATCH] tty: only print sysrq help for handlers that are enabled

Also print out a notice when sysrq is in selective mode.

Signed-off-by: Shawn Landden <shawn@...rchofgit.com>
---
 drivers/tty/sysrq.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index ce396ec..4eee0e4 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -548,9 +548,14 @@ void __handle_sysrq(int key, bool check_mask)
 					;
 				if (j != i)
 					continue;
-				printk("%s ", sysrq_key_table[i]->help_msg);
+				/* only print if handler is enabled */
+				if (sysrq_enabled & 1 ||
+				    sysrq_enabled & sysrq_key_table[i]->enable_mask)
+					printk("%s ", sysrq_key_table[i]->help_msg);
 			}
 		}
+		if (!(sysrq_enabled & 1))
+			printk("(some options are disabled)");
 		printk("\n");
 		console_loglevel = orig_log_level;
 	}
-- 
1.8.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/