diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-06-04 14:20:46 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-05 00:37:18 +0400 |
| commit | 3fde85df5421eb01f563fef6f111ba73ab0d120e (patch) | |
| tree | d22a55a611627b1985019af69e2740a452e5e97d /drivers/char/vt_ioctl.c | |
| parent | c1bfffa94e0ca951ed450788991c9310adb8e823 (diff) | |
| download | linux-3fde85df5421eb01f563fef6f111ba73ab0d120e.tar.xz | |
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/vt_ioctl.c')
| -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, 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; } |