Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
From: John Stultz
Date: Wed Jun 01 2011 - 02:46:35 EST
On Mon, 2011-05-30 at 08:12 +0200, Richard Cochran wrote:
> On Sun, May 29, 2011 at 10:53:12PM +0300, Dan Carpenter wrote:
> > copy_to_user() returns the number of bytes remaining, but we want a
> > negative error code here.
> >
> > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
> >
> > 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;
>
> Yes, right, and thanks for the extra review.
>
> Thomas, can you please queue these two patches for 3.0-rc2?
>
> (Or should John Stultz handle this sort of thing?)
Queued in my tree.
Richard, Since you like these, do you mind formally acking them so I can
add that?
thanks
-john
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/