4.5-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Dan Carpenter <[email protected]>

commit 585cb132a48190b554aecda2ebc3e2911fcbb665 upstream.

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.')
Signed-off-by: Dan Carpenter <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: Eric Anholt <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/vc4/vc4_bo.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -499,11 +499,12 @@ vc4_create_shader_bo_ioctl(struct drm_de
        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.
         */


Reply via email to