lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 104/260] i915: return -EFAULT if copy_to_user fails
    Date
    From: Dan Carpenter <error27@gmail.com>

    commit 9927a403ca8c97798129953fa9cbb5dc259c7cb9 upstream.

    copy_to_user returns the number of bytes remaining to be copied, but we
    want to return a negative error code here. These are returned to
    userspace.

    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/gpu/drm/i915/i915_dma.c | 12 +++++++++---
    1 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
    index 9550230..b0ac371 100644
    --- a/drivers/gpu/drm/i915/i915_dma.c
    +++ b/drivers/gpu/drm/i915/i915_dma.c
    @@ -691,8 +691,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
    ret = copy_from_user(cliprects, batch->cliprects,
    batch->num_cliprects *
    sizeof(struct drm_clip_rect));
    - if (ret != 0)
    + if (ret != 0) {
    + ret = -EFAULT;
    goto fail_free;
    + }
    }

    mutex_lock(&dev->struct_mutex);
    @@ -733,8 +735,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
    return -ENOMEM;

    ret = copy_from_user(batch_data, cmdbuf->buf, cmdbuf->sz);
    - if (ret != 0)
    + if (ret != 0) {
    + ret = -EFAULT;
    goto fail_batch_free;
    + }

    if (cmdbuf->num_cliprects) {
    cliprects = kcalloc(cmdbuf->num_cliprects,
    @@ -747,8 +751,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
    ret = copy_from_user(cliprects, cmdbuf->cliprects,
    cmdbuf->num_cliprects *
    sizeof(struct drm_clip_rect));
    - if (ret != 0)
    + if (ret != 0) {
    + ret = -EFAULT;
    goto fail_clip_free;
    + }
    }

    mutex_lock(&dev->struct_mutex);
    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 08:59    [W:2.989 / U:1.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site