summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_perf.c
diff options
context:
space:
mode:
authorDan Carpenter2016-07-13 12:35:29 +0200
committerRob Clark2016-07-16 16:29:32 +0200
commit5745d21f9a92fa3b70149df69574a13becc3d53e (patch)
treeff3a878abd84eafc7b77c146a73c1f8192a8df4f /drivers/gpu/drm/msm/msm_perf.c
parentdrm/msm/hdmi: use PTR_ERR_OR_ZERO() to simplify the code (diff)
downloadkernel-qcow2-linux-5745d21f9a92fa3b70149df69574a13becc3d53e.tar.gz
kernel-qcow2-linux-5745d21f9a92fa3b70149df69574a13becc3d53e.tar.xz
kernel-qcow2-linux-5745d21f9a92fa3b70149df69574a13becc3d53e.zip
drm/msm: return -EFAULT instead of bytes remaining
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> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_perf.c')
-rw-r--r--drivers/gpu/drm/msm/msm_perf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index 830857c47c86..17fe4e53e0d1 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;