drm/v3d: Fix use-after-free of CPU job query arrays on error path

The CPU job ioctl's fail label calls kvfree() on cpu_job's timestamp and
performance query arrays after v3d_job_cleanup(), which drops the job's
last reference and frees cpu_job. Reading cpu_job at that point is a
use-after-free. Also, on the early v3d_job_init() failure path, it is a
NULL dereference, since v3d_job_deallocate() zeroes the local pointer.

In the success path, the arrays are released from the scheduler's
.free_job callback, but on the error path, they are freed manually, as
the job was never pushed to the scheduler. While the success path deals
with this correctly, the fail path doesn't.

On top of that, the manual kvfree() calls only free the array storage;
they don't drm_syncobj_put() the per-query syncobjs that
v3d_timestamp_query_info_free() and v3d_performance_query_info_free()
release on the success path. So the same fail path that triggers the
use-after-free also leaks one syncobj reference per query.

Unify the CPU job teardown into the CPU job's kref destructor, mirroring
v3d_render_job_free(). The scheduler's .free_job slot reverts to the
generic v3d_sched_job_free() and the fail label drops the manual
kvfree() calls, leaving a single teardown path that is reached from both
the scheduler and the ioctl error path. That removes the use-after-free,
the NULL dereference, and the syncobj leak by construction.

Cc: stable@vger.kernel.org
Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")
Assisted-by: Claude:claude-opus-4.7
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Link: https://patch.msgid.link/20260515-v3d-cpu-job-leaks-v1-1-7f147cbbf935@igalia.com
Signed-off-by: Maíra Canal <mcanal@igalia.com>

diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
index 1855ef5b3b5fe4e2de1cf0b77bced3735c23ab15..94bf628dc91cc69776513abca8fd110ec586d961 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_sched.c
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
@@ -125,20 +125,6 @@ v3d_performance_query_info_free(struct v3d_performance_query_info *query_info,
        }
 }
 
-static void
-v3d_cpu_job_free(struct drm_sched_job *sched_job)
-{
-       struct v3d_cpu_job *job = to_cpu_job(sched_job);
-
-       v3d_timestamp_query_info_free(&job->timestamp_query,
-                                     job->timestamp_query.count);
-
-       v3d_performance_query_info_free(&job->performance_query,
-                                       job->performance_query.count);
-
-       v3d_job_cleanup(&job->base);
-}
-
 static void
 v3d_switch_perfmon(struct v3d_dev *v3d, struct v3d_job *job)
 {
@@ -830,7 +816,7 @@ static const struct drm_sched_backend_ops v3d_cache_clean_sched_ops = {
 
 static const struct drm_sched_backend_ops v3d_cpu_sched_ops = {
        .run_job = v3d_cpu_job_run,
-       .free_job = v3d_cpu_job_free
+       .free_job = v3d_sched_job_free
 };
 
 static int

diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
index ee4512db294b3538a246275fc558766a69ec3c9d..e3a6e7cc7bd5dca8084a4096457ce14732917af0 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_submit.c
+++ b/drivers/gpu/drm/v3d/v3d_submit.c
@@ -123,6 +123,21 @@ v3d_render_job_free(struct kref *ref)
        v3d_job_free(ref);
 }
 
+static void
+v3d_cpu_job_free(struct kref *ref)
+{
+       struct v3d_cpu_job *job = container_of(ref, struct v3d_cpu_job,
+                                              base.refcount);
+
+       v3d_timestamp_query_info_free(&job->timestamp_query,
+                                     job->timestamp_query.count);
+
+       v3d_performance_query_info_free(&job->performance_query,
+                                       job->performance_query.count);
+
+       v3d_job_free(ref);
+}
+
 void v3d_job_cleanup(struct v3d_job *job)
 {
        if (!job)
@@ -1302,7 +1317,7 @@ v3d_submit_cpu_ioctl(struct drm_device *dev, void *data,
        trace_v3d_submit_cpu_ioctl(&v3d->drm, cpu_job->job_type);
 
        ret = v3d_job_init(v3d, file_priv, &cpu_job->base,
-                          v3d_job_free, 0, &se, V3D_CPU);
+                          v3d_cpu_job_free, 0, &se, V3D_CPU);
        if (ret) {
                v3d_job_deallocate((void *)&cpu_job);
                goto fail;
@@ -1385,8 +1400,6 @@ fail:
        v3d_job_cleanup((void *)csd_job);
        v3d_job_cleanup(clean_job);
        v3d_put_multisync_post_deps(&se);
-       kvfree(cpu_job->timestamp_query.queries);
-       kvfree(cpu_job->performance_query.queries);
 
        return ret;
 }