Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62e3a3e3 authored by Prakash Kamliya's avatar Prakash Kamliya Committed by Rob Clark
Browse files

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: default avatarPrakash Kamliya <pkamliya@codeaurora.org>
Signed-off-by: default avatarSharat Masetty <smasetty@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent a1ed6def

drivers/gpu/drm/msm/msm_gem.c

+10 −4
Original line number Diff line number Diff line
@@ -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);



		if (msm_obj->sgt)

			sg_free_table(msm_obj->sgt);



		kfree(msm_obj->sgt);



		if (use_pages(obj))