projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fa7b6a
)
ptp: Return -EFAULT on copy_to_user() errors
author
Dan Carpenter
<
[email protected]
>
Sun, 29 May 2011 19:53:12 +0000
(22:53 +0300)
committer
John Stultz
<
[email protected]
>
Thu, 2 Jun 2011 02:29:08 +0000
(19:29 -0700)
copy_to_user() returns the number of bytes remaining, but we want a
negative error code in ptp_ioctl.
Signed-off-by: Dan Carpenter <
[email protected]
>
Acked-by: Richard Cochran <
[email protected]
>
Signed-off-by: John Stultz <
[email protected]
>
drivers/ptp/ptp_chardev.c
patch
|
blob
|
history
diff --git
a/drivers/ptp/ptp_chardev.c
b/drivers/ptp/ptp_chardev.c
index a8d03aeb40516af8dbba5beb4f18ee8a37af1a71..93fa22de59773c51074103a06fd8c6118a843dd7 100644
(file)
--- 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: