vt_ioctl: fix lock imbalance
authorJiri Slaby <jirislaby@gmail.com>
Mon, 22 Jun 2009 17:42:18 +0000 (18:42 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Jun 2009 18:32:24 +0000 (11:32 -0700)
Don't return from switch/case directly in vt_ioctl. Set ret and break
instead so that we unlock BKL.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/vt_ioctl.c

index e6ce632a393ee720d5715fae7664e7025f30ae58..7539bed0f7e07ec315e9dff21a3a0914161afee6 100644 (file)
@@ -396,7 +396,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
        kbd = kbd_table + console;
        switch (cmd) {
        case TIOCLINUX:
-               return tioclinux(tty, arg);
+               ret = tioclinux(tty, arg);
+               break;
        case KIOCSOUND:
                if (!perm)
                        goto eperm;