From: Alexey Dobriyan Date: Wed, 1 Apr 2009 21:30:04 +0000 (+0400) Subject: serial: fixup /proc/tty/driver/serial after proc_fops conversion X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=833bb3046b6cb320e775ea2160ddca87d53260d5;p=linux-2.6-omap-h63xx.git serial: fixup /proc/tty/driver/serial after proc_fops conversion "struct tty_driver *" lies in m->private not in v which is SEQ_TOKEN_START which is 1 which is enough to trigger NULL dereference next line: BUG: unable to handle kernel NULL pointer dereference at 000000ad IP: [] uart_proc_show+0xe/0x2b0 Noticed by Linus. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds --- diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index bf3c0e32a33..b0bb29d804a 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -1765,7 +1765,7 @@ static void uart_line_info(struct seq_file *m, struct uart_driver *drv, int i) static int uart_proc_show(struct seq_file *m, void *v) { - struct tty_driver *ttydrv = v; + struct tty_driver *ttydrv = m->private; struct uart_driver *drv = ttydrv->driver_state; int i;