diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-03-08 15:09:41 +0300 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2016-03-13 17:09:12 -0700 |
| commit | 585cb132a48190b554aecda2ebc3e2911fcbb665 (patch) | |
| tree | a06a893368b7acc7f6505f8511cd05a43c398637 /drivers/gpu/drm/vc4 | |
| parent | 0b06e0a7945130e6a187f7959529cba7725f573a (diff) | |
| download | talos-op-linux-585cb132a48190b554aecda2ebc3e2911fcbb665.tar.gz talos-op-linux-585cb132a48190b554aecda2ebc3e2911fcbb665.zip | |
drm/vc4: Return -EFAULT on copy_from_user() failure
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>
Diffstat (limited to 'drivers/gpu/drm/vc4')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_bo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 22278bcfc60e..ac8eafea6361 100644 --- 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_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. */ |
