Skip to content

Commit

Permalink
drm: Free the object ref on error.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Wilson authored and Dave Airlie committed Feb 20, 2009
1 parent ad45aa9 commit 3e49c4f
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -310,12 +312,8 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
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
Expand All @@ -324,6 +322,12 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
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;
}

/**
Expand Down

0 comments on commit 3e49c4f

Please sign in to comment.