Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5850222d authored by Peter Hurley's avatar Peter Hurley Committed by Sasha Levin
Browse files

console: Fix console name size mismatch 



commit 30a22c215a0007603ffc08021f2e8b64018517dd upstream.

commit 6ae9200f ("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.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit 2cf6258c282608633c9477e5c8e319e948565122)
parent de62b348

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
@@ -2440,6 +2440,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 &&