diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-22 18:42:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:50:22 -0700 |
| commit | 024820f5cb728224cff58085f0e07105502267b5 (patch) | |
| tree | e01a970c153e677ed80a76c79b3e1cc5b98af943 | |
| parent | d1ad6a3b00b1580b8dbdedddbd0d1d65411c65f8 (diff) | |
| download | linux-024820f5cb728224cff58085f0e07105502267b5.tar.gz linux-024820f5cb728224cff58085f0e07105502267b5.tar.bz2 linux-024820f5cb728224cff58085f0e07105502267b5.zip | |
vt_ioctl: fix lock imbalance
commit a115902f67ef51fbbe83e214fb761aaa9734c1ce upstream.
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/char/vt_ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index e6ce632a393e..7539bed0f7e0 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -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; |