Commit-ID: e23ef227d10878ff3f323a1dfed10205a1825b71 Gitweb: http://git.kernel.org/tip/e23ef227d10878ff3f323a1dfed10205a1825b71 Author: Dan Carpenter <error27@xxxxxxxxx> AuthorDate: Sun, 29 May 2011 22:53:12 +0300 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Wed, 1 Jun 2011 19:29:08 -0700 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@xxxxxxxxx> Acked-by: Richard Cochran <richard.cochran@xxxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- 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 a8d03ae..93fa22d 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: -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html