All of lore.kernel.org
 help / color / mirror / Atom feed
* [patch] drm/msm: return -EFAULT instead of bytes remaining
@ 2016-07-13 10:35 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2016-07-13 10:35 UTC (permalink / raw)
  To: Rob Clark
  Cc: linux-arm-msm, kernel-janitors, linux-kernel, dri-devel,
	freedreno

copy_to/from_user returns the number of bytes remaining to be copied but
we want to return -EFAULT.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index 830857c..17fe4e5 100644
--- a/drivers/gpu/drm/msm/msm_perf.c
+++ b/drivers/gpu/drm/msm/msm_perf.c
@@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 		size_t sz, loff_t *ppos)
 {
 	struct msm_perf_state *perf = file->private_data;
-	int n = 0, ret;
+	int n = 0, ret = 0;
 
 	mutex_lock(&perf->read_lock);
 
@@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 	}
 
 	n = min((int)sz, perf->buftot - perf->bufpos);
-	ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
-	if (ret)
+	if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	perf->bufpos += n;
 	*ppos += n;
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 24254e0..3a5fdfc 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
 		goto out;
 
 	n = min_t(int, sz, circ_count_to_end(&rd->fifo));
-	ret = copy_to_user(buf, fptr, n);
-	if (ret)
+	if (copy_to_user(buf, fptr, n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
 	*ppos += n;

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [patch] drm/msm: return -EFAULT instead of bytes remaining
@ 2016-07-13 10:35 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2016-07-13 10:35 UTC (permalink / raw)
  To: Rob Clark
  Cc: linux-arm-msm, kernel-janitors, linux-kernel, dri-devel,
	freedreno

copy_to/from_user returns the number of bytes remaining to be copied but
we want to return -EFAULT.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index 830857c..17fe4e5 100644
--- a/drivers/gpu/drm/msm/msm_perf.c
+++ b/drivers/gpu/drm/msm/msm_perf.c
@@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 		size_t sz, loff_t *ppos)
 {
 	struct msm_perf_state *perf = file->private_data;
-	int n = 0, ret;
+	int n = 0, ret = 0;
 
 	mutex_lock(&perf->read_lock);
 
@@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 	}
 
 	n = min((int)sz, perf->buftot - perf->bufpos);
-	ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
-	if (ret)
+	if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	perf->bufpos += n;
 	*ppos += n;
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 24254e0..3a5fdfc 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
 		goto out;
 
 	n = min_t(int, sz, circ_count_to_end(&rd->fifo));
-	ret = copy_to_user(buf, fptr, n);
-	if (ret)
+	if (copy_to_user(buf, fptr, n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
 	*ppos += n;
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [patch] drm/msm: return -EFAULT instead of bytes remaining
@ 2016-07-13 10:35 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2016-07-13 10:35 UTC (permalink / raw)
  To: Rob Clark
  Cc: David Airlie, linux-arm-msm, dri-devel, freedreno, linux-kernel,
	kernel-janitors

copy_to/from_user returns the number of bytes remaining to be copied but
we want to return -EFAULT.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index 830857c..17fe4e5 100644
--- a/drivers/gpu/drm/msm/msm_perf.c
+++ b/drivers/gpu/drm/msm/msm_perf.c
@@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 		size_t sz, loff_t *ppos)
 {
 	struct msm_perf_state *perf = file->private_data;
-	int n = 0, ret;
+	int n = 0, ret = 0;
 
 	mutex_lock(&perf->read_lock);
 
@@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
 	}
 
 	n = min((int)sz, perf->buftot - perf->bufpos);
-	ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
-	if (ret)
+	if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	perf->bufpos += n;
 	*ppos += n;
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 24254e0..3a5fdfc 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
 		goto out;
 
 	n = min_t(int, sz, circ_count_to_end(&rd->fifo));
-	ret = copy_to_user(buf, fptr, n);
-	if (ret)
+	if (copy_to_user(buf, fptr, n)) {
+		ret = -EFAULT;
 		goto out;
+	}
 
 	fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
 	*ppos += n;

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [patch] drm/msm: return -EFAULT instead of bytes remaining
  2016-07-13 10:35 ` Dan Carpenter
  (?)
@ 2016-07-13 12:56   ` Rob Clark
  -1 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2016-07-13 12:56 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: David Airlie, linux-arm-msm,
	kernel-janitors-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On Wed, Jul 13, 2016 at 6:35 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> copy_to/from_user returns the number of bytes remaining to be copied but
> we want to return -EFAULT.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

thanks, I've added to msm-next

BR,
-R

>
> diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
> index 830857c..17fe4e5 100644
> --- a/drivers/gpu/drm/msm/msm_perf.c
> +++ b/drivers/gpu/drm/msm/msm_perf.c
> @@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>                 size_t sz, loff_t *ppos)
>  {
>         struct msm_perf_state *perf = file->private_data;
> -       int n = 0, ret;
> +       int n = 0, ret = 0;
>
>         mutex_lock(&perf->read_lock);
>
> @@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>         }
>
>         n = min((int)sz, perf->buftot - perf->bufpos);
> -       ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
> -       if (ret)
> +       if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         perf->bufpos += n;
>         *ppos += n;
> diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
> index 24254e0..3a5fdfc 100644
> --- a/drivers/gpu/drm/msm/msm_rd.c
> +++ b/drivers/gpu/drm/msm/msm_rd.c
> @@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
>                 goto out;
>
>         n = min_t(int, sz, circ_count_to_end(&rd->fifo));
> -       ret = copy_to_user(buf, fptr, n);
> -       if (ret)
> +       if (copy_to_user(buf, fptr, n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
>         *ppos += n;

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [patch] drm/msm: return -EFAULT instead of bytes remaining
@ 2016-07-13 12:56   ` Rob Clark
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2016-07-13 12:56 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: David Airlie, linux-arm-msm,
	kernel-janitors-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On Wed, Jul 13, 2016 at 6:35 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> copy_to/from_user returns the number of bytes remaining to be copied but
> we want to return -EFAULT.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

thanks, I've added to msm-next

BR,
-R

>
> diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
> index 830857c..17fe4e5 100644
> --- a/drivers/gpu/drm/msm/msm_perf.c
> +++ b/drivers/gpu/drm/msm/msm_perf.c
> @@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>                 size_t sz, loff_t *ppos)
>  {
>         struct msm_perf_state *perf = file->private_data;
> -       int n = 0, ret;
> +       int n = 0, ret = 0;
>
>         mutex_lock(&perf->read_lock);
>
> @@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>         }
>
>         n = min((int)sz, perf->buftot - perf->bufpos);
> -       ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
> -       if (ret)
> +       if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         perf->bufpos += n;
>         *ppos += n;
> diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
> index 24254e0..3a5fdfc 100644
> --- a/drivers/gpu/drm/msm/msm_rd.c
> +++ b/drivers/gpu/drm/msm/msm_rd.c
> @@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
>                 goto out;
>
>         n = min_t(int, sz, circ_count_to_end(&rd->fifo));
> -       ret = copy_to_user(buf, fptr, n);
> -       if (ret)
> +       if (copy_to_user(buf, fptr, n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
>         *ppos += n;
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [patch] drm/msm: return -EFAULT instead of bytes remaining
@ 2016-07-13 12:56   ` Rob Clark
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2016-07-13 12:56 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: David Airlie, linux-arm-msm, dri-devel@lists.freedesktop.org,
	freedreno, Linux Kernel Mailing List, kernel-janitors

On Wed, Jul 13, 2016 at 6:35 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> copy_to/from_user returns the number of bytes remaining to be copied but
> we want to return -EFAULT.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

thanks, I've added to msm-next

BR,
-R

>
> diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
> index 830857c..17fe4e5 100644
> --- a/drivers/gpu/drm/msm/msm_perf.c
> +++ b/drivers/gpu/drm/msm/msm_perf.c
> @@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>                 size_t sz, loff_t *ppos)
>  {
>         struct msm_perf_state *perf = file->private_data;
> -       int n = 0, ret;
> +       int n = 0, ret = 0;
>
>         mutex_lock(&perf->read_lock);
>
> @@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf,
>         }
>
>         n = min((int)sz, perf->buftot - perf->bufpos);
> -       ret = copy_to_user(buf, &perf->buf[perf->bufpos], n);
> -       if (ret)
> +       if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         perf->bufpos += n;
>         *ppos += n;
> diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
> index 24254e0..3a5fdfc 100644
> --- a/drivers/gpu/drm/msm/msm_rd.c
> +++ b/drivers/gpu/drm/msm/msm_rd.c
> @@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf,
>                 goto out;
>
>         n = min_t(int, sz, circ_count_to_end(&rd->fifo));
> -       ret = copy_to_user(buf, fptr, n);
> -       if (ret)
> +       if (copy_to_user(buf, fptr, n)) {
> +               ret = -EFAULT;
>                 goto out;
> +       }
>
>         fifo->tail = (fifo->tail + n) & (BUF_SZ - 1);
>         *ppos += n;

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-07-13 12:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-13 10:35 [patch] drm/msm: return -EFAULT instead of bytes remaining Dan Carpenter
2016-07-13 10:35 ` Dan Carpenter
2016-07-13 10:35 ` Dan Carpenter
2016-07-13 12:56 ` Rob Clark
2016-07-13 12:56   ` Rob Clark
2016-07-13 12:56   ` Rob Clark

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.