diff options
author | Dan Carpenter <error27@gmail.com> | 2010-06-04 06:20:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-04 16:37:18 -0400 |
commit | 3fde85df5421eb01f563fef6f111ba73ab0d120e (patch) | |
tree | d22a55a611627b1985019af69e2740a452e5e97d /drivers/char | |
parent | c1bfffa94e0ca951ed450788991c9310adb8e823 (diff) |
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.c | 4 |
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, | |||
1303 | if (!perm) | 1303 | if (!perm) |
1304 | goto eperm; | 1304 | goto eperm; |
1305 | ret = copy_from_user(&ui, up, sizeof(struct unimapinit)); | 1305 | ret = copy_from_user(&ui, up, sizeof(struct unimapinit)); |
1306 | if (!ret) | 1306 | if (ret) |
1307 | ret = -EFAULT; | ||
1308 | else | ||
1307 | con_clear_unimap(vc, &ui); | 1309 | con_clear_unimap(vc, &ui); |
1308 | break; | 1310 | break; |
1309 | } | 1311 | } |