redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/msm: return -EFAULT if copy_from_user() fails

Browse source 
copy_from_user_inatomic() is actually a local function that returns
-EFAULT or positive values on error.  Otherwise copy_from_user() returns
the number of bytes remaining to be copied.  We want to return -EFAULT
here.

I removed an unlikely() because we just did a copy_from_user()
so I don't think it can possibly make a difference.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Dan Carpenter 2017-01-16 14:58:08 +03:00 committed by Rob Clark
parent f079f6d999
commit 21c42da18e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/msm/msm_gem_submit.c
View file

@ -95,13 +95,13 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
*/ */
submit->bos[i].flags = 0; submit->bos[i].flags = 0;
ret = copy_from_user_inatomic(&submit_bo, userptr, sizeof(submit_bo)); if (copy_from_user_inatomic(&submit_bo, userptr, sizeof(submit_bo))) {
if (unlikely(ret)) {
pagefault_enable(); pagefault_enable();
spin_unlock(&file->table_lock); spin_unlock(&file->table_lock);
ret = copy_from_user(&submit_bo, userptr, sizeof(submit_bo)); if (copy_from_user(&submit_bo, userptr, sizeof(submit_bo))) {
if (ret) ret = -EFAULT;
goto out; goto out;
}
spin_lock(&file->table_lock); spin_lock(&file->table_lock);
pagefault_disable(); pagefault_disable();
} }
@ -317,9 +317,10 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob
uint64_t iova; uint64_t iova;
bool valid; bool valid;
ret = copy_from_user(&submit_reloc, userptr, sizeof(submit_reloc)); if (copy_from_user(&submit_reloc, userptr, sizeof(submit_reloc))) {
if (ret) ret = -EFAULT;
goto out; goto out;
}
if (submit_reloc.submit_offset % 4) { if (submit_reloc.submit_offset % 4) {
DRM_ERROR("non-aligned reloc offset: %u\n", DRM_ERROR("non-aligned reloc offset: %u\n",