Skip to content

Commit 89f2685

Browse files
Jiri SlabyAndi Kleen
authored andcommitted
TTY: ldisc, fix open flag handling
commit 7f90cfc upstream. When a concrete ldisc open fails in tty_ldisc_open, we forget to clear TTY_LDISC_OPEN. This causes a false warning on the next ldisc open: WARNING: at drivers/char/tty_ldisc.c:445 tty_ldisc_open+0x26/0x38() Hardware name: System Product Name Modules linked in: ... Pid: 5251, comm: a.out Tainted: G W 2.6.32-5-686 coolya#1 Call Trace: [<c1030321>] ? warn_slowpath_common+0x5e/0x8a [<c1030357>] ? warn_slowpath_null+0xa/0xc [<c119311c>] ? tty_ldisc_open+0x26/0x38 [<c11936c5>] ? tty_set_ldisc+0x218/0x304 ... So clear the bit when failing... Introduced in c65c9bc (tty: rewrite the ldisc locking) back in 2.6.31-rc1. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@linux.intel.com> Reported-by: Sergey Lapin <slapin@ossfans.org> Tested-by: Sergey Lapin <slapin@ossfans.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
1 parent d509e24 commit 89f2685

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/char/tty_ldisc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)
452452
/* BKL here locks verus a hangup event */
453453
lock_kernel();
454454
ret = ld->ops->open(tty);
455+
if (ret)
456+
clear_bit(TTY_LDISC_OPEN, &tty->flags);
455457
unlock_kernel();
456458
return ret;
457459
}

0 commit comments

Comments
 (0)