Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763947AbZGABJt (ORCPT ); Tue, 30 Jun 2009 21:09:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761133AbZGAAf3 (ORCPT ); Tue, 30 Jun 2009 20:35:29 -0400 Received: from kroah.org ([198.145.64.141]:60582 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761522AbZGAAfV (ORCPT ); Tue, 30 Jun 2009 20:35:21 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jun 30 17:24:38 2009 Message-Id: <20090701002438.308543471@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 30 Jun 2009 17:24:08 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jiri Slaby , Alan Cox Subject: [patch 079/108] vt_ioctl: fix lock imbalance References: <20090701002249.937782934@mini.kroah.org> Content-Disposition: inline; filename=vt_ioctl-fix-lock-imbalance.patch In-Reply-To: <20090701002838.GA7100@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1150 Lines: 29 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Jiri Slaby 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 Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/char/vt_ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -396,7 +396,8 @@ int vt_ioctl(struct tty_struct *tty, str kbd = kbd_table + console; switch (cmd) { case TIOCLINUX: - return tioclinux(tty, arg); + ret = tioclinux(tty, arg); + break; case KIOCSOUND: if (!perm) goto eperm; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/