drm: Free the object ref on error.
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 9 Feb 2009 11:31:41 +0000 (11:31 +0000)
committerDave Airlie <airlied@redhat.com>
Fri, 20 Feb 2009 02:21:08 +0000 (12:21 +1000)
Ensure that the object is unreferenced if we fail to allocate during
drm_gem_flink_ioctl().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/gpu/drm/drm_gem.c

index 308fe1e207f53df2a5c3b48e439f9db500ebb202..e5a8ebf9a66270c96726b0079fa53f3757974d16 100644 (file)
@@ -295,8 +295,10 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
                return -EBADF;
 
 again:
-       if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
-               return -ENOMEM;
+       if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {
+               ret = -ENOMEM;
+               goto err;
+       }
 
        spin_lock(&dev->object_name_lock);
        if (obj->name) {
@@ -310,12 +312,8 @@ again:
        if (ret == -EAGAIN)
                goto again;
 
-       if (ret != 0) {
-               mutex_lock(&dev->struct_mutex);
-               drm_gem_object_unreference(obj);
-               mutex_unlock(&dev->struct_mutex);
-               return ret;
-       }
+       if (ret != 0)
+               goto err;
 
        /*
         * Leave the reference from the lookup around as the
@@ -324,6 +322,12 @@ again:
        args->name = (uint64_t) obj->name;
 
        return 0;
+
+err:
+       mutex_lock(&dev->struct_mutex);
+       drm_gem_object_unreference(obj);
+       mutex_unlock(&dev->struct_mutex);
+       return ret;
 }
 
 /**