diff options
| author | YoungJun Cho <yj44.cho@samsung.com> | 2013-06-26 10:21:40 +0900 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-28 12:49:07 +1000 |
| commit | 7d8f06ac901300e0b517a263f571531ca27e47b6 (patch) | |
| tree | f1964a8607f87392a461b71e66aa6f7bb5a3ac3f /drivers/gpu/drm/drm_prime.c | |
| parent | 538d6661f5d8ad9dcf4ab66c9a99407464111e7a (diff) | |
| download | lwn-7d8f06ac901300e0b517a263f571531ca27e47b6.tar.gz lwn-7d8f06ac901300e0b517a263f571531ca27e47b6.zip | |
drm/prime: fix to put an exported dma_buf for adding handle failure
When drm_prime_add_buf_handle() returns failure for an exported
dma_buf, the dma_buf was already allocated and its refcount was
increased, so it needs to be put.
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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_prime.c')
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index b1cd47438850..340caabc0424 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -306,7 +306,7 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, ret = drm_prime_add_buf_handle(&file_priv->prime, obj->export_dma_buf, handle); if (ret) - goto out; + goto fail_put_dmabuf; *prime_fd = dma_buf_fd(buf, flags); mutex_unlock(&file_priv->prime.lock); @@ -315,6 +315,12 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, out_have_obj: get_dma_buf(dmabuf); *prime_fd = dma_buf_fd(dmabuf, flags); + goto out; + +fail_put_dmabuf: + /* clear NOT to be checked when releasing dma_buf */ + obj->export_dma_buf = NULL; + dma_buf_put(buf); out: drm_gem_object_unreference_unlocked(obj); mutex_unlock(&file_priv->prime.lock); |