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
| ||
|
Message-ID: <20071007163824.GA30063@elte.hu> Date: Sun, 7 Oct 2007 18:38:24 +0200 From: Ingo Molnar <mingo@...e.hu> To: Jan Engelhardt <jengelh@...putergmbh.de> Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Oleg Verych <olecom@...wer.upol.cz> Subject: Re: [PATCH 1/2] Colored kernel output (run3) * Jan Engelhardt <jengelh@...putergmbh.de> wrote: > Colored kernel message output (1/2) > > This patch makes it possible to give kernel messages a selectable > color. It can be chosen at compile time, overridden at boot time, and > changed at run time. minor fix: i had to use the slightly modified patch below instead of the one you posted, so that the second patch applies fine. Color output is just fine with this plus your #2 one applied. Adding vt.printk_color=0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08 to the boot line worked as expected. Ingo ---------------> Colored kernel message output (1/2) This patch makes it possible to give kernel messages a selectable color. It can be chosen at compile time, overridden at boot time, and changed at run time. References: http://lkml.org/lkml/2007/4/1/162 http://lkml.org/lkml/2007/10/5/199 Signed-off-by: Jan Engelhardt <jengelh@....de> Signed-off-by: Ingo Molnar <mingo@...e.hu> --- drivers/char/Kconfig | 42 ++++++++++++++++++++++++++++++++++++++++++ drivers/char/vt.c | 24 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+) Index: linux/drivers/char/Kconfig =================================================================== --- linux.orig/drivers/char/Kconfig +++ linux/drivers/char/Kconfig @@ -58,6 +58,48 @@ config VT_CONSOLE If unsure, say Y. +config VT_CKO + bool "Colored kernel message output" + depends on VT_CONSOLE + ---help--- + This option enables kernel messages to be emitted in + colors other than the default. + + If unsure, say N. + +config VT_PRINTK_COLOR + hex "Colored kernel message output" + range 0x00 0xFF + depends on VT_CKO + default 0x07 + ---help--- + This option defines with which color kernel messages will be + printed to the console. + + The value you need to enter here is the value is composed + (OR-ed) of a foreground and a background color. + + Foreground: + 0x00 = black, 0x08 = dark gray, + 0x01 = red, 0x09 = light red, + 0x02 = green, 0x0A = light green, + 0x03 = brown, 0x0B = yellow, + 0x04 = blue, 0x0C = light blue, + 0x05 = magenta, 0x0D = light magenta, + 0x06 = cyan, 0x0E = light cyan, + 0x07 = gray, 0x0F = white, + + (Foreground colors 0x08 to 0x0F do not work when a VGA + console font with 512 glyphs is used.) + + Background: + 0x00 = black, 0x40 = blue, + 0x10 = red, 0x50 = magenta, + 0x20 = green, 0x60 = cyan, + 0x30 = brown, 0x70 = gray, + + For example, 0x1F would yield white on red. + config HW_CONSOLE bool depends on VT && !S390 && !UML Index: linux/drivers/char/vt.c =================================================================== --- linux.orig/drivers/char/vt.c +++ linux/drivers/char/vt.c @@ -73,6 +73,7 @@ */ #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/types.h> #include <linux/sched.h> #include <linux/tty.h> @@ -2344,6 +2345,24 @@ struct tty_driver *console_driver; #ifdef CONFIG_VT_CONSOLE +#ifdef CONFIG_VT_CKO +static unsigned int printk_color __read_mostly = CONFIG_VT_PRINTK_COLOR; +module_param(printk_color, uint, S_IRUGO | S_IWUSR); + +static inline void vc_set_color(struct vc_data *vc, unsigned char color) +{ + vc->vc_color = color_table[color & 0xF] | + (color_table[(color >> 4) & 0x7] << 4) | + (color & 0x80); + update_attr(vc); +} +#else +static unsigned int printk_color; +static inline void vc_set_color(const struct vc_data *vc, unsigned char c) +{ +} +#endif + /* * Console on virtual terminal * @@ -2384,12 +2403,14 @@ static void vt_console_print(struct cons hide_cursor(vc); start = (ushort *)vc->vc_pos; + vc_set_color(vc, printk_color); /* Contrived structure to try to emulate original need_wrap behaviour * Problems caused when we have need_wrap set on '\n' character */ while (count--) { c = *b++; if (c == 10 || c == 13 || c == 8 || vc->vc_need_wrap) { + vc_set_color(vc, vc->vc_def_color); if (cnt > 0) { if (CON_IS_VISIBLE(vc)) vc->vc_sw->con_putcs(vc, start, cnt, vc->vc_y, vc->vc_x); @@ -2402,6 +2423,7 @@ static void vt_console_print(struct cons bs(vc); start = (ushort *)vc->vc_pos; myx = vc->vc_x; + vc_set_color(vc, printk_color); continue; } if (c != 13) @@ -2409,6 +2431,7 @@ static void vt_console_print(struct cons cr(vc); start = (ushort *)vc->vc_pos; myx = vc->vc_x; + vc_set_color(vc, printk_color); if (c == 10 || c == 13) continue; } @@ -2430,6 +2453,7 @@ static void vt_console_print(struct cons vc->vc_need_wrap = 1; } } + vc_set_color(vc, vc->vc_def_color); set_cursor(vc); quit: - 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/
Powered by blists - more mailing lists