Merge "drm/msm: fix leak in failed get_pages" into msm-4.14 (285008ac) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/gpu/drm/msm/msm_gem.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -93,13 +93,15 @@ 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)) {
		dev_err(dev->dev, "failed to allocate sgt\n");
		return ERR_CAST(msm_obj->sgt);
		}
		void *ptr = ERR_CAST(msm_obj->sgt);

		msm_obj->pages = p;
		msm_obj->sgt = NULL;
		return ptr;
		}

		/*
		* Make sure to flush the CPU cache for newly allocated memory
		@@ -130,6 +132,7 @@ static void put_pages(struct drm_gem_object *obj)
		struct msm_gem_object *msm_obj = to_msm_bo(obj);

		if (msm_obj->pages) {
		if (msm_obj->sgt)
		sg_free_table(msm_obj->sgt);
		kfree(msm_obj->sgt);