[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20250228023105.3737605-1-haoxiang_li2024@163.com>
Date: Fri, 28 Feb 2025 10:31:05 +0800
From: Haoxiang Li <haoxiang_li2024@....com>
To: robdclark@...il.com,
quic_abhinavk@...cinc.com,
dmitry.baryshkov@...aro.org,
sean@...rly.run,
marijn.suijten@...ainline.org,
airlied@...il.com,
simona@...ll.ch,
sumit.semwal@...aro.org,
christian.koenig@....com
Cc: linux-arm-msm@...r.kernel.org,
dri-devel@...ts.freedesktop.org,
freedreno@...ts.freedesktop.org,
linux-kernel@...r.kernel.org,
linux-media@...r.kernel.org,
linaro-mm-sig@...ts.linaro.org,
Haoxiang Li <haoxiang_li2024@....com>,
stable@...r.kernel.org
Subject: [PATCH] drm/msm: fix a potential memory leak issue in submit_create()
The memory allocated by msm_fence_alloc() actually is the
container of msm_fence_alloc()'s return value. Thus, just
free its return value is not enough.
Add a helper 'msm_fence_free()' in msm_fence.h/msm_fence.c
to do the complete job.
Fixes: f94e6a51e17c ("drm/msm: Pre-allocate hw_fence")
Cc: stable@...r.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@....com>
---
drivers/gpu/drm/msm/msm_fence.c | 7 +++++++
drivers/gpu/drm/msm/msm_fence.h | 1 +
drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/msm_fence.c b/drivers/gpu/drm/msm/msm_fence.c
index 1a5d4f1c8b42..0e257afaf443 100644
--- a/drivers/gpu/drm/msm/msm_fence.c
+++ b/drivers/gpu/drm/msm/msm_fence.c
@@ -184,6 +184,13 @@ msm_fence_alloc(void)
return &f->base;
}
+void msm_fence_free(struct dma_fence *fence)
+{
+ struct msm_fence *f = to_msm_fence(fence);
+
+ kfree(f);
+}
+
void
msm_fence_init(struct dma_fence *fence, struct msm_fence_context *fctx)
{
diff --git a/drivers/gpu/drm/msm/msm_fence.h b/drivers/gpu/drm/msm/msm_fence.h
index 148196375a0b..635c68629070 100644
--- a/drivers/gpu/drm/msm/msm_fence.h
+++ b/drivers/gpu/drm/msm/msm_fence.h
@@ -82,6 +82,7 @@ bool msm_fence_completed(struct msm_fence_context *fctx, uint32_t fence);
void msm_update_fence(struct msm_fence_context *fctx, uint32_t fence);
struct dma_fence * msm_fence_alloc(void);
+void msm_fence_free(struct dma_fence *fence);
void msm_fence_init(struct dma_fence *fence, struct msm_fence_context *fctx);
static inline bool
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index dee470403036..3fdcfc5714b6 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -56,7 +56,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
ret = drm_sched_job_init(&submit->base, queue->entity, 1, queue);
if (ret) {
- kfree(submit->hw_fence);
+ msm_fence_free(submit->hw_fence);
kfree(submit);
return ERR_PTR(ret);
}
--
2.25.1
Powered by blists - more mailing lists