drm/vc4: Fix a couple error codes in vc4_cl_lookup_bos()

If the allocation fails the current code returns success.  If
copy_from_user() fails it returns the number of bytes remaining instead
of -EFAULT.

Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
Signed-off-by: Dan Carpenter <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 47a095f392f8a7b5443227933c78b500a4c7137f..303f23c962206836d8c95786ad835d7625e10ee8 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -544,14 +544,15 @@ vc4_cl_lookup_bos(struct drm_device *dev,
 
        handles = drm_malloc_ab(exec->bo_count, sizeof(uint32_t));
        if (!handles) {
+               ret = -ENOMEM;
                DRM_ERROR("Failed to allocate incoming GEM handles\n");
                goto fail;
        }
 
-       ret = copy_from_user(handles,
-                            (void __user *)(uintptr_t)args->bo_handles,
-                            exec->bo_count * sizeof(uint32_t));
-       if (ret) {
+       if (copy_from_user(handles,
+                          (void __user *)(uintptr_t)args->bo_handles,
+                          exec->bo_count * sizeof(uint32_t))) {
+               ret = -EFAULT;
                DRM_ERROR("Failed to copy in GEM handles\n");
                goto fail;
        }