]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/vc4: Return -EFAULT on copy_from_user() failure
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 8 Mar 2016 12:09:41 +0000 (15:09 +0300)
committerEric Anholt <eric@anholt.net>
Mon, 14 Mar 2016 00:09:12 +0000 (17:09 -0700)
The copy_from_user() function returns the number of bytes not copied but
we want to return a negative error code.

Fixes: 463873d57014 ('drm/vc4: Add an API for creating GPU shaders in GEM BOs.')
Cc: stable@vger.kernel.org
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/vc4/vc4_bo.c

index 22278bcfc60eac4ed40fac0e31dda840aa4b703e..ac8eafea63611b831d5c05ce637c3a84e7e09665 100644 (file)
@@ -499,11 +499,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,
        if (IS_ERR(bo))
                return PTR_ERR(bo);
 
-       ret = copy_from_user(bo->base.vaddr,
+       if (copy_from_user(bo->base.vaddr,
                             (void __user *)(uintptr_t)args->data,
-                            args->size);
-       if (ret != 0)
+                            args->size)) {
+               ret = -EFAULT;
                goto fail;
+       }
        /* Clear the rest of the memory from allocating from the BO
         * cache.
         */