Skip to content

Commit

Permalink
tty: Fix leaks introduced by the shift to separate ldisc objects
Browse files Browse the repository at this point in the history
Gold star for the kmemleak detector.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jun 16, 2009
1 parent 03347e2 commit 8d2ead7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/char/tty_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,10 @@ static struct tty_ldisc *tty_ldisc_try_get(int disc)
}
}
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
if (err)
if (err) {
kfree(ld);
return ERR_PTR(err);
}
return ld;
}

Expand Down Expand Up @@ -262,7 +264,7 @@ const struct file_operations tty_ldiscs_proc_fops = {
* @ld: line discipline
*
* Install an instance of a line discipline into a tty structure. The
* ldisc must have a reference count above zero to ensure it remains/
* ldisc must have a reference count above zero to ensure it remains.
* The tty instance refcount starts at zero.
*
* Locking:
Expand Down

0 comments on commit 8d2ead7

Please sign in to comment.