tty: Fix unbalanced BKL handling in error path
authorAlan Cox <alan@linux.intel.com>
Tue, 4 May 2010 19:42:36 +0000 (20:42 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 13 May 2010 19:10:56 +0000 (12:10 -0700)
Arnd noted:

After the "retry_open:" label, we first get the tty_mutex
and then the BKL. However a the end of tty_open, we jump
back to retry_open with the BKL still held. If we run into
this case, the tty_open function will be left with the BKL
still held.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/char/tty_io.c

index 6da962c..d71f0fc 100644 (file)
@@ -1875,6 +1875,7 @@ got_driver:
                 */
                if (filp->f_op == &hung_up_tty_fops)
                        filp->f_op = &tty_fops;
+               unlock_kernel();
                goto retry_open;
        }
        unlock_kernel();