2006-11-16 02:52:12

by Chris Wright

[permalink] [raw]
Subject: [patch 26/30] Char: isicom, fix close bug

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Jiri Slaby <[email protected]>

[PATCH] Char: isicom, fix close bug

port is dereferenced even if it is NULL. Dereference it _after_ the
check if (!port)... Thanks Eric <[email protected]> for reporting this.

This fixes

http://bugzilla.kernel.org/show_bug.cgi?id=7527

Signed-off-by: Jiri Slaby <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---

drivers/char/isicom.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.18.2.orig/drivers/char/isicom.c
+++ linux-2.6.18.2/drivers/char/isicom.c
@@ -1062,11 +1062,12 @@ static void isicom_shutdown_port(struct
static void isicom_close(struct tty_struct *tty, struct file *filp)
{
struct isi_port *port = tty->driver_data;
- struct isi_board *card = port->card;
+ struct isi_board *card;
unsigned long flags;

if (!port)
return;
+ card = port->card;
if (isicom_paranoia_check(port, tty->name, "isicom_close"))
return;


--