Commit c026ca58 authored Jan 10, 2010 by Jiri Slaby Committed by David S. Miller Jan 10, 2010

NET: irda, remove unnecessary checks

Stanse found a potential null dereference in ircomm_tty_close
and ircomm_tty_hangup. There is a check for tty being NULL,
but it is dereferenced earlier. But it is bogus, the tty cannot
be NULL, so remove the !tty checks.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c3f6c21d

net/irda/ircomm/ircomm_tty.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -496,9 +496,6 @@ static void ircomm_tty_close(struct tty_struct tty, struct file filp)

		IRDA_DEBUG(0, "%s()\n", __func__ );

		if (!tty)
		return;

		IRDA_ASSERT(self != NULL, return;);
		IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);

		@@ -1007,9 +1004,6 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
		IRDA_ASSERT(self != NULL, return;);
		IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);

		if (!tty)
		return;

		/* ircomm_tty_flush_buffer(tty); */
		ircomm_tty_shutdown(self);