console: Fix console name size mismatch (30a22c21) · Commits · 戴 / test

commit ("enlarge console.name") increased the storage for the console name to 16 bytes, but not the corresponding struct console_cmdline::name storage. Console names longer than 8 bytes cause read beyond end-of-string and failure to match console; I'm not sure if there are other unexpected consequences. Cc: <stable@vger.kernel.org> # 2.6.22+ Signed-off-by:

Peter Hurley <peter@hurleysoftware.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

kernel/printk/console_cmdline.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@

		struct console_cmdline
		{
		char name[8]; /* Name of the driver */
		char name[16]; /* Name of the driver */
		int index; /* Minor dev. to use */
		char options; / Options for the driver */
		#ifdef CONFIG_A11Y_BRAILLE_CONSOLE

kernel/printk/printk.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2464,6 +2464,7 @@ void register_console(struct console *newcon)
		for (i = 0, c = console_cmdline;
		i < MAX_CMDLINECONSOLES && c->name[0];
		i++, c++) {
		BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
		if (strcmp(c->name, newcon->name) != 0)
		continue;
		if (newcon->index >= 0 &&

Admin message