2005-01-13 15:33:08

by Blaisorblade

[permalink] [raw]
Subject: [patch 1/8] uml: avoid NULL dereference in line.c


From: Frank Sorenson <[email protected]>

This patch reorders two lines to check a variable for NULL before using
the variable.

Signed-off-by: Frank Sorenson <[email protected]>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

linux-2.6.11-paolo/arch/um/drivers/line.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/um/drivers/line.c~uml-reorder_null_check arch/um/drivers/line.c
--- linux-2.6.11/arch/um/drivers/line.c~uml-reorder_null_check 2005-01-13 01:54:17.163057872 +0100
+++ linux-2.6.11-paolo/arch/um/drivers/line.c 2005-01-13 01:54:17.166057416 +0100
@@ -593,8 +593,8 @@ irqreturn_t winch_interrupt(int irq, voi
}
}
tty = winch->tty;
- line = tty->driver_data;
if (tty != NULL) {
+ line = tty->driver_data;
chan_window_size(&line->chan_list,
&tty->winsize.ws_row,
&tty->winsize.ws_col);
_