diff options
author | Dan Carpenter <error27@gmail.com> | 2011-05-29 15:53:12 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-06-01 22:29:08 -0400 |
commit | e23ef227d10878ff3f323a1dfed10205a1825b71 (patch) | |
tree | 175dedf039bee62658960c270643f5cbc019cdb1 | |
parent | 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c (diff) |
ptp: Return -EFAULT on copy_to_user() errors
copy_to_user() returns the number of bytes remaining, but we want a
negative error code in ptp_ioctl.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r-- | drivers/ptp/ptp_chardev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index a8d03aeb4051..93fa22de5977 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c | |||
@@ -46,7 +46,8 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) | |||
46 | caps.n_ext_ts = ptp->info->n_ext_ts; | 46 | caps.n_ext_ts = ptp->info->n_ext_ts; |
47 | caps.n_per_out = ptp->info->n_per_out; | 47 | caps.n_per_out = ptp->info->n_per_out; |
48 | caps.pps = ptp->info->pps; | 48 | caps.pps = ptp->info->pps; |
49 | err = copy_to_user((void __user *)arg, &caps, sizeof(caps)); | 49 | if (copy_to_user((void __user *)arg, &caps, sizeof(caps))) |
50 | err = -EFAULT; | ||
50 | break; | 51 | break; |
51 | 52 | ||
52 | case PTP_EXTTS_REQUEST: | 53 | case PTP_EXTTS_REQUEST: |