summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-02-09 11:31:41 +0000
committerDave Airlie <airlied@redhat.com>2009-02-20 12:21:08 +1000
commit3e49c4f4cf786b70bbc369b99e590de4bebac1b3 (patch)
tree4805b8adb31570573983c098dd11c307c21381ab /drivers/gpu
parentad45aa9e6e010283bbd8cf0c6309866233e113f2 (diff)
downloadop-kernel-dev-3e49c4f4cf786b70bbc369b99e590de4bebac1b3.zip
op-kernel-dev-3e49c4f4cf786b70bbc369b99e590de4bebac1b3.tar.gz
drm: Free the object ref on error.
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_gem.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 308fe1e..e5a8ebf 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -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;
}
/**
OpenPOWER on IntegriCloud