lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
On Tue, May 31, 2011 at 11:46:20PM -0700, John Stultz wrote:
> 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@gmail.com>
> > >
> > > 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?

Acked-by: Richard Cochran <richard.cochran@omicron.at>


\
 
 \ /
  Last update: 2011-06-01 12:19    [W:3.863 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site