From d06f5fbd413ef13d43ebf14cc588693a67d664bb Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Thu, 1 Oct 2009 15:43:59 -0700
Subject: [PATCH] --- yaml --- r: 166640 b: refs/heads/master c:
 a09efb07b5025fb75f42e903d31767a3cafede89 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/vt_ioctl.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3ca2d1cfd9f..3696c26dc58b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a28b3dc90964ed961b6ed2c320885ab8b3a0a8ff
+refs/heads/master: a09efb07b5025fb75f42e903d31767a3cafede89
diff --git a/trunk/drivers/char/vt_ioctl.c b/trunk/drivers/char/vt_ioctl.c
index 29c651ab0d78..6b36ee56e6fe 100644
--- a/trunk/drivers/char/vt_ioctl.c
+++ b/trunk/drivers/char/vt_ioctl.c
@@ -981,8 +981,10 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
 			goto eperm;
 
 		if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
-						sizeof(struct vt_setactivate)))
-			return -EFAULT;
+					sizeof(struct vt_setactivate))) {
+			ret = -EFAULT;
+			goto out;
+		}
 		if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
 			ret = -ENXIO;
 		else {