lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 081/103] drm/gem: fix not to assign error value to gem name
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: YoungJun Cho <yj44.cho@samsung.com>

    commit 2e07fb229396f99fc173d8612f0f83ea9de0341b upstream.

    If idr_alloc() is failed, obj->name can be error value. Also
    it cleans up duplicated flink processing code.

    This regression has been introduced in

    commit 2e928815c1886fe628ed54623aa98d0889cf5509
    Author: Tejun Heo <tj@kernel.org>
    Date: Wed Feb 27 17:04:08 2013 -0800

    drm: convert to idr_alloc()

    Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
    Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/drm_gem.c | 18 +++++++-----------
    1 file changed, 7 insertions(+), 11 deletions(-)

    --- a/drivers/gpu/drm/drm_gem.c
    +++ b/drivers/gpu/drm/drm_gem.c
    @@ -453,25 +453,21 @@ drm_gem_flink_ioctl(struct drm_device *d
    spin_lock(&dev->object_name_lock);
    if (!obj->name) {
    ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);
    - obj->name = ret;
    - args->name = (uint64_t) obj->name;
    - spin_unlock(&dev->object_name_lock);
    - idr_preload_end();
    -
    if (ret < 0)
    goto err;
    - ret = 0;
    +
    + obj->name = ret;

    /* Allocate a reference for the name table. */
    drm_gem_object_reference(obj);
    - } else {
    - args->name = (uint64_t) obj->name;
    - spin_unlock(&dev->object_name_lock);
    - idr_preload_end();
    - ret = 0;
    }

    + args->name = (uint64_t) obj->name;
    + ret = 0;
    +
    err:
    + spin_unlock(&dev->object_name_lock);
    + idr_preload_end();
    drm_gem_object_unreference_unlocked(obj);
    return ret;
    }



    \
     
     \ /
      Last update: 2013-07-24 05:41    [W:4.105 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site