Skip to content

Commit

Permalink
[PATCH] Potential null pointer dereference in amiga serial driver
Browse files Browse the repository at this point in the history
A pointer is dereferenced before it is null-checked.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
TINNES Julien RD-MAPS-ISS authored and Linus Torvalds committed Jun 23, 2005
1 parent 17abee3 commit d9ad7ef
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/char/amiserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -861,13 +861,18 @@ static void change_speed(struct async_struct *info,

static void rs_put_char(struct tty_struct *tty, unsigned char ch)
{
struct async_struct *info = (struct async_struct *)tty->driver_data;
struct async_struct *info;
unsigned long flags;

if (!tty)
return;

info = tty->driver_data;

if (serial_paranoia_check(info, tty->name, "rs_put_char"))
return;

if (!tty || !info->xmit.buf)
if (!info->xmit.buf)
return;

local_irq_save(flags);
Expand Down Expand Up @@ -910,13 +915,18 @@ static void rs_flush_chars(struct tty_struct *tty)
static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count)
{
int c, ret = 0;
struct async_struct *info = (struct async_struct *)tty->driver_data;
struct async_struct *info;
unsigned long flags;

if (!tty)
return 0;

info = tty->driver_data;

if (serial_paranoia_check(info, tty->name, "rs_write"))
return 0;

if (!tty || !info->xmit.buf || !tmp_buf)
if (!info->xmit.buf || !tmp_buf)
return 0;

local_save_flags(flags);
Expand Down

0 comments on commit d9ad7ef

Please sign in to comment.