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

The dma_map_sg(), in map_dma_buf callback operation of prime helper,
can return 0 when it fails to map, so it needs to release related
resources.

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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 5b7b911..f1699e9 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -74,8 +74,13 @@ static struct sg_table *drm_gem_map_dma_buf(struct 
dma_buf_attachment *attach,

        sgt = obj->dev->driver->gem_prime_get_sg_table(obj);

-       if (!IS_ERR_OR_NULL(sgt))
-               dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir);
+       if (!IS_ERR_OR_NULL(sgt)) {
+               if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) {
+                       sg_free_table(sgt);
+                       kfree(sgt);
+                       sgt = ERR_PTR(-ENOMEM);
+               }
+       }

        mutex_unlock(&obj->dev->struct_mutex);
        return sgt;
-- 
1.7.4.1

Reply via email to