All of lore.kernel.org
 help / color / mirror / Atom feed
* [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
@ 2011-05-29 19:53 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2011-05-29 19:53 UTC (permalink / raw)
  To: Richard Cochran
  Cc: David S. Miller, John Stultz, Arnd Bergmann, open list, kernel-janitors

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;
 		break;
 
 	case PTP_EXTTS_REQUEST:

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
@ 2011-05-29 19:53 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2011-05-29 19:53 UTC (permalink / raw)
  To: Richard Cochran
  Cc: David S. Miller, John Stultz, Arnd Bergmann, open list, kernel-janitors

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;
 		break;
 
 	case PTP_EXTTS_REQUEST:

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
  2011-05-29 19:53 ` Dan Carpenter
@ 2011-05-30  6:12   ` Richard Cochran
  -1 siblings, 0 replies; 8+ messages in thread
From: Richard Cochran @ 2011-05-30  6:12 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Richard Cochran, David S. Miller, John Stultz, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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?)

Thanks,
Richard

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
@ 2011-05-30  6:12   ` Richard Cochran
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Cochran @ 2011-05-30  6:12 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Richard Cochran, David S. Miller, John Stultz, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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?)

Thanks,
Richard

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
  2011-05-30  6:12   ` Richard Cochran
@ 2011-06-01  6:46     ` John Stultz
  -1 siblings, 0 replies; 8+ messages in thread
From: John Stultz @ 2011-06-01  6:46 UTC (permalink / raw)
  To: Richard Cochran
  Cc: Dan Carpenter, Richard Cochran, David S. Miller, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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?

thanks
-john



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
@ 2011-06-01  6:46     ` John Stultz
  0 siblings, 0 replies; 8+ messages in thread
From: John Stultz @ 2011-06-01  6:46 UTC (permalink / raw)
  To: Richard Cochran
  Cc: Dan Carpenter, Richard Cochran, David S. Miller, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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?

thanks
-john



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
  2011-06-01  6:46     ` John Stultz
@ 2011-06-01 10:16       ` Richard Cochran
  -1 siblings, 0 replies; 8+ messages in thread
From: Richard Cochran @ 2011-06-01 10:16 UTC (permalink / raw)
  To: John Stultz
  Cc: Dan Carpenter, Richard Cochran, David S. Miller, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [patch 1/2] ptp: return -EFAULT on copy_to_user() errors
@ 2011-06-01 10:16       ` Richard Cochran
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Cochran @ 2011-06-01 10:16 UTC (permalink / raw)
  To: John Stultz
  Cc: Dan Carpenter, Richard Cochran, David S. Miller, Arnd Bergmann,
	open list, kernel-janitors, Thomas Gleixner

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>

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-06-01 10:16 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-29 19:53 [patch 1/2] ptp: return -EFAULT on copy_to_user() errors Dan Carpenter
2011-05-29 19:53 ` Dan Carpenter
2011-05-30  6:12 ` Richard Cochran
2011-05-30  6:12   ` Richard Cochran
2011-06-01  6:46   ` John Stultz
2011-06-01  6:46     ` John Stultz
2011-06-01 10:16     ` Richard Cochran
2011-06-01 10:16       ` Richard Cochran

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.