summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-06-04 12:20:46 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-04 13:37:18 -0700
commit3fde85df5421eb01f563fef6f111ba73ab0d120e (patch)
treed22a55a611627b1985019af69e2740a452e5e97d /drivers/char
parentc1bfffa94e0ca951ed450788991c9310adb8e823 (diff)
downloadlinux-3fde85df5421eb01f563fef6f111ba73ab0d120e.tar.gz
linux-3fde85df5421eb01f563fef6f111ba73ab0d120e.tar.bz2
linux-3fde85df5421eb01f563fef6f111ba73ab0d120e.zip
vt_ioctl: return -EFAULT on copy_from_user errors
copy_from_user() returns the number of bytes remaining but we want to return a negative error code here. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/vt_ioctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 6aa10284104a..cb19dbc52136 100644
--- a/drivers/char/vt_ioctl.c
+++ b/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;
}