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

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

Char: synclink, remove unnecessary checks 



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: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e6c4ef98

drivers/char/synclink.c

+2 −2
Original line number Diff line number Diff line
@@ -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 ||