Skip to content

Commit

Permalink
tty: fix data race in tty_ldisc_ref_wait()
Browse files Browse the repository at this point in the history
tty_ldisc_ref_wait() checks tty->ldisc under tty->ldisc_sem.
But if ldisc==NULL it releases them sem and reloads
tty->ldisc without holding the sem. This is wrong and
can lead to returning non-NULL ldisc without protection.

Don't reload tty->ldisc second time.

Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
Cc: syzkaller@googlegroups.com
Cc: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dmitry Vyukov authored and Greg Kroah-Hartman committed Mar 17, 2017
1 parent 5362544 commit a4a3e06
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/tty/tty_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,13 @@ const struct file_operations tty_ldiscs_proc_fops = {

struct tty_ldisc *tty_ldisc_ref_wait(struct tty_struct *tty)
{
struct tty_ldisc *ld;

ldsem_down_read(&tty->ldisc_sem, MAX_SCHEDULE_TIMEOUT);
if (!tty->ldisc)
ld = tty->ldisc;
if (!ld)
ldsem_up_read(&tty->ldisc_sem);
return tty->ldisc;
return ld;
}
EXPORT_SYMBOL_GPL(tty_ldisc_ref_wait);

Expand Down

0 comments on commit a4a3e06

Please sign in to comment.