From 55a5b730e0dde45e94b126f913878c8e05853b57 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 4 Jun 2010 12:20:46 +0200
Subject: [PATCH] --- yaml --- r: 199851 b: refs/heads/master c:
 3fde85df5421eb01f563fef6f111ba73ab0d120e h: refs/heads/master i:   199849:
 54ba0a916616af95bfc75e3ede6c9f2a9a9e3c7c   199847:
 9d081ebc5ca112950840cd499de312e9e449b302 v: v3

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

diff --git a/[refs] b/[refs]
index f7ffc76a6c8d..94cf50afc76b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1bfffa94e0ca951ed450788991c9310adb8e823
+refs/heads/master: 3fde85df5421eb01f563fef6f111ba73ab0d120e
diff --git a/trunk/drivers/char/vt_ioctl.c b/trunk/drivers/char/vt_ioctl.c
index 6aa10284104a..cb19dbc52136 100644
--- a/trunk/drivers/char/vt_ioctl.c
+++ b/trunk/drivers/char/vt_ioctl.c
@@ -1303,7 +1303,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
 		if (!perm)
 			goto eperm;
 		ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
-		if (!ret)
+		if (ret)
+			ret = -EFAULT;
+		else
 			con_clear_unimap(vc, &ui);
 		break;
 	      }