---

yaml --- r: 199851 b: refs/heads/master c: 3fde85d h: refs/heads/master i: 199849: 54ba0a9 199847: 9d081eb v: v3
git-mirror · Jun 4, 2010 · 55a5b73 · 55a5b73
1 parent c15135e
commit 55a5b73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 	      }