kill-the-BKL/vt: Prevent holding the BKL on return to userspace

From: Henne
Date: Wed Aug 26 2009 - 11:42:25 EST


From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>

kill-the-BKL/vt: Prevent holding the BKL on return to userspace

Returning from a function which holds the BLK isn't a good idea,
so we won't let it return from this point.
Instead we set the return variable and let the function return the
normal way without BKL held.

Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>

---
This patch is only for the kill-the-BKL branch.

diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 181ff38..b3da7b3 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -396,7 +396,9 @@ 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;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/