diff options
| author |   Dan Carpenter <error27@gmail.com> | 2011-05-29 22:53:12 +0300 |
|---|---|---|
| committer |   John Stultz <john.stultz@linaro.org> | 2011-06-01 19:29:08 -0700 |
| commit | e23ef227d10878ff3f323a1dfed10205a1825b71 (patch) | |
| tree | 175dedf039bee62658960c270643f5cbc019cdb1 /drivers/ptp | |
| parent | Revert "mm: fail GFP_DMA allocations when ZONE_DMA is not configured" (diff) | |
| download | linux-dev-e23ef227d10878ff3f323a1dfed10205a1825b71.tar.xz linux-dev-e23ef227d10878ff3f323a1dfed10205a1825b71.zip | |
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>
Diffstat (limited to 'drivers/ptp')
| -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) caps.n_ext_ts = ptp->info->n_ext_ts; caps.n_per_out = ptp->info->n_per_out; caps.pps = ptp->info->pps; - err = copy_to_user((void __user *)arg, &caps, sizeof(caps)); + if (copy_to_user((void __user *)arg, &caps, sizeof(caps))) + err = -EFAULT; break; case PTP_EXTTS_REQUEST: |