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

Commit 52b762f7 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: pdc_cons, fix open vs timer race 



The timer is initialized too late. tty->open may fire an invalid
timer. So initialize the timer earlier using DEFINE_TIMER.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e380a81e

arch/parisc/kernel/pdc_cons.c

+2 −5
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ static int pdc_console_setup(struct console *co, char *options) 


#define PDC_CONS_POLL_DELAY (30 * HZ / 1000)



static struct timer_list pdc_console_timer;

static void pdc_console_poll(unsigned long unused);

static DEFINE_TIMER(pdc_console_timer, pdc_console_poll, 0, 0);



static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)

{
@@ -205,10 +206,6 @@ static int __init pdc_console_tty_driver_init(void) 


	pdc_console_tty_driver = drv;



	/* No need to initialize the pdc_console_timer if tty isn't allocated */

	init_timer(&pdc_console_timer);

	pdc_console_timer.function = pdc_console_poll;



	return 0;

}