From: YoungJun Cho <yj44....@samsung.com>

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 at samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim at samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
---
 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 5b7b911..afff7c8 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -235,7 +235,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);
@@ -244,6 +244,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);
-- 
1.7.4.1

Reply via email to