diff options
| author | Prakash Kamliya <pkamliya@codeaurora.org> | 2017-12-04 19:10:15 +0530 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2017-12-13 11:12:03 -0500 |
| commit | 62e3a3e342af3c313ab38603811ecdb1fcc79edb (patch) | |
| tree | fcf9f3a83dd7daac0a7803b636eea0d53d5c2a49 /drivers/gpu/drm/msm | |
| parent | a1ed6def4410451eeb2ce85b4270e6fe9d3c902c (diff) | |
| download | linux-stable-62e3a3e342af3c313ab38603811ecdb1fcc79edb.tar.gz linux-stable-62e3a3e342af3c313ab38603811ecdb1fcc79edb.tar.bz2 linux-stable-62e3a3e342af3c313ab38603811ecdb1fcc79edb.zip | |
drm/msm: fix leak in failed get_pages
get_pages doesn't keep a reference of the pages allocated
when it fails later in the code path. This can lead to
a memory leak. Keep reference of the allocated pages so
that it can be freed when msm_gem_free_object gets called
later during cleanup.
Signed-off-by: Prakash Kamliya <pkamliya@codeaurora.org>
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 81fe6d6740ce..07376de9ff4c 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -93,14 +93,17 @@ static struct page **get_pages(struct drm_gem_object *obj) return p; } + msm_obj->pages = p; + msm_obj->sgt = drm_prime_pages_to_sg(p, npages); if (IS_ERR(msm_obj->sgt)) { + void *ptr = ERR_CAST(msm_obj->sgt); + dev_err(dev->dev, "failed to allocate sgt\n"); - return ERR_CAST(msm_obj->sgt); + msm_obj->sgt = NULL; + return ptr; } - msm_obj->pages = p; - /* For non-cached buffers, ensure the new pages are clean * because display controller, GPU, etc. are not coherent: */ @@ -135,7 +138,10 @@ static void put_pages(struct drm_gem_object *obj) if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED)) dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl, msm_obj->sgt->nents, DMA_BIDIRECTIONAL); - sg_free_table(msm_obj->sgt); + + if (msm_obj->sgt) + sg_free_table(msm_obj->sgt); + kfree(msm_obj->sgt); if (use_pages(obj)) |