Prev: input: make i2c device id constant
Next: check high watermark after shrink zone
From: Jiri Slaby on 10 Jan 2010 06:40
Stanse found a potential null dereference in mgsl_put_char and
mgsl_write. There is a check for tty being NULL, but it is
dereferenced earlier.

Actually, tty cannot be NULL in .write and .put_char, so remove
the tests.

Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
Cc: Greg Kroah-Hartman <gregkh(a)suse.de>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
Cc: Alan Cox <alan(a)linux.intel.com>
---
drivers/char/synclink.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 4846b73..0658fc5 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -2031,7 +2031,7 @@ static int mgsl_put_char(struct tty_struct *tty, unsigned char ch)
if (mgsl_paranoia_check(info, tty->name, "mgsl_put_char"))
return 0;

- if (!tty || !info->xmit_buf)
+ if (!info->xmit_buf)
return 0;

spin_lock_irqsave(&info->irq_spinlock, flags);
@@ -2121,7 +2121,7 @@ static int mgsl_write(struct tty_struct * tty,
if (mgsl_paranoia_check(info, tty->name, "mgsl_write"))
goto cleanup;

- if (!tty || !info->xmit_buf)
+ if (!info->xmit_buf)
goto cleanup;

if ( info->params.mode == MGSL_MODE_HDLC ||
--
1.6.5.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: input: make i2c device id constant
Next: check high watermark after shrink zone