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

Commit 0c09b2ac authored by Alan Jenkins's avatar Alan Jenkins Committed by Dmitry Torokhov
Browse files

Input: keyboard - fix theoretical race on vt switch 



A VT switch can theoretically change fg_console between

        vc = vc_cons[fg_console].d
and
        kbd = kbd_table + fg_console

Fix it by replacing the second fg_console with vc->vc_num.

Signed-off-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 71bb21b6

drivers/char/keyboard.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1136,7 +1136,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char u 
static void kbd_rawcode(unsigned char data)

static void kbd_rawcode(unsigned char data)

{

{

	struct vc_data *vc = vc_cons[fg_console].d;

	struct vc_data *vc = vc_cons[fg_console].d;

	kbd = kbd_table + fg_console;

	kbd = kbd_table + vc->vc_num;

	if (kbd->kbdmode == VC_RAW)

	if (kbd->kbdmode == VC_RAW)

		put_queue(vc, data);

		put_queue(vc, data);

}

}
@@ -1157,7 +1157,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) 
		tty->driver_data = vc;

		tty->driver_data = vc;

	}

	}





	kbd = kbd_table + fg_console;

	kbd = kbd_table + vc->vc_num;





	if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)

	if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)

		sysrq_alt = down ? keycode : 0;

		sysrq_alt = down ? keycode : 0;