]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/sched: Fix fence reference count leak
authorqianyi liu <liuqianyi125@gmail.com>
Tue, 11 Mar 2025 06:02:51 +0000 (14:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Mar 2025 20:59:55 +0000 (21:59 +0100)
commit a952f1ab696873be124e31ce5ef964d36bce817f upstream.

The last_scheduled fence leaks when an entity is being killed and adding
the cleanup callback fails.

Decrement the reference count of prev when dma_fence_add_callback()
fails, ensuring proper balance.

Cc: stable@vger.kernel.org # v6.2+
[phasta: add git tag info for stable kernel]
Fixes: 2fdb8a8f07c2 ("drm/scheduler: rework entity flush, kill and fini")
Signed-off-by: qianyi liu <liuqianyi125@gmail.com>
Signed-off-by: Philipp Stanner <phasta@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250311060251.4041101-1-liuqianyi125@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/scheduler/sched_entity.c

index d3462be74930374f64af37489698222023f33691..53130a50584ca09ccc740315c45cc4bfb431f173 100644 (file)
@@ -237,9 +237,16 @@ static void drm_sched_entity_kill(struct drm_sched_entity *entity)
                struct drm_sched_fence *s_fence = job->s_fence;
 
                dma_fence_get(&s_fence->finished);
-               if (!prev || dma_fence_add_callback(prev, &job->finish_cb,
-                                          drm_sched_entity_kill_jobs_cb))
+               if (!prev ||
+                   dma_fence_add_callback(prev, &job->finish_cb,
+                                          drm_sched_entity_kill_jobs_cb)) {
+                       /*
+                        * Adding callback above failed.
+                        * dma_fence_put() checks for NULL.
+                        */
+                       dma_fence_put(prev);
                        drm_sched_entity_kill_jobs_cb(NULL, &job->finish_cb);
+               }
 
                prev = &s_fence->finished;
        }