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>
This commit is contained in:
parent
ad45aa9e6e
commit
3e49c4f4cf
@ -295,8 +295,10 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
|
|||||||
return -EBADF;
|
return -EBADF;
|
||||||
|
|
||||||
again:
|
again:
|
||||||
if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
|
if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {
|
||||||
return -ENOMEM;
|
ret = -ENOMEM;
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
|
||||||
spin_lock(&dev->object_name_lock);
|
spin_lock(&dev->object_name_lock);
|
||||||
if (obj->name) {
|
if (obj->name) {
|
||||||
@ -310,12 +312,8 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
|
|||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
goto again;
|
goto again;
|
||||||
|
|
||||||
if (ret != 0) {
|
if (ret != 0)
|
||||||
mutex_lock(&dev->struct_mutex);
|
goto err;
|
||||||
drm_gem_object_unreference(obj);
|
|
||||||
mutex_unlock(&dev->struct_mutex);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Leave the reference from the lookup around as the
|
* Leave the reference from the lookup around as the
|
||||||
@ -324,6 +322,12 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
|
|||||||
args->name = (uint64_t) obj->name;
|
args->name = (uint64_t) obj->name;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
err:
|
||||||
|
mutex_lock(&dev->struct_mutex);
|
||||||
|
drm_gem_object_unreference(obj);
|
||||||
|
mutex_unlock(&dev->struct_mutex);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user