[PATCH v2] drm/v3d: Fix double free of query arrays on parse failure

From: Xiaolei Wang

Date: Thu Nov 19 2026 - 21:28:51 EST


v3d_get_cpu_timestamp_query_params(), v3d_get_cpu_reset_timestamp_params(),
v3d_get_cpu_copy_query_results_params() and v3d_copy_query_info() -- the
latter shared by the reset and copy performance parsers -- free the query
array on their error paths through v3d_timestamp_query_info_free() and
v3d_performance_query_info_free().

The same job is then released by v3d_submit_cpu_ioctl()'s failure path
(v3d_submit_cleanup_jobs() -> v3d_job_cleanup() -> v3d_job_put() ->
v3d_cpu_job_free()), which calls the same helpers on the same query_info.
On these error paths query_info->count was never assigned -- it was only
written after the parse loop completed -- so the syncobj loop ran zero
times and no syncobj was put twice, but the "if (query_info->queries)" test
still succeeded and the dangling pointer was handed to kvfree() a second
time.

Every failure inside the parse loop takes this path: -ENOENT from
drm_syncobj_find(), -EFAULT from get_user(), or -ENOMEM from
kvmalloc_array() in v3d_copy_query_info().

Fix the ownership instead of the symptom: the query array, and the per
query kperfmon_ids, belong to the job and are freed exactly once, by
v3d_cpu_job_free(). The parsers no longer free anything; they only fill
the array in and record how far they got:

- query_info->count is set before the parse loop, so the helpers know how
many entries were touched when parsing fails halfway;

- the arrays are allocated with kvzalloc_objs(), so entries that were
never reached carry a NULL syncobj and a NULL kperfmon_ids;

- the helpers walk the full count but test every entry, so they put
exactly the syncobj references that were taken, keeping
put-count == find-count on all failure paths;

- the inline kvfree() of kperfmon_ids in v3d_copy_query_info() is dropped
for the same reason;

- the count argument of v3d_timestamp_query_info_free() and
v3d_performance_query_info_free() goes away, as the count now lives in
query_info itself.

With that, a parsing failure leaves nothing behind: the job release path is
the single owner, and a second release cannot happen because the parser
never releases at all.

Tested on a Raspberry Pi 5 (v3d) .

Fixes: 0e50fcc20bd8 ("drm/v3d: Fix potential memory leak in the timestamp extension")
Fixes: 32df4abc44f2 ("drm/v3d: Fix potential memory leak in the performance extension")
Cc: stable@xxxxxxxxxxxxxxx
Cc: Maíra Canal <mcanal@xxxxxxxxxx>
Cc: Iago Toral Quiroga <itoral@xxxxxxxxxx>
Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxx>
Signed-off-by: Xiaolei Wang <wangxiaolei01@xxxxxxxxxxx>
---
drivers/gpu/drm/v3d/v3d_drv.h | 6 +-
drivers/gpu/drm/v3d/v3d_sched.c | 42 ++++++----
drivers/gpu/drm/v3d/v3d_submit.c | 129 ++++++++++---------------------
3 files changed, 69 insertions(+), 108 deletions(-)

diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
index 7c7bdf6e51a5..e5c9ad86449a 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -669,10 +669,8 @@ static __always_inline int v3d_pm_runtime_put(struct v3d_dev *v3d)
}

/* v3d_sched.c */
-void v3d_timestamp_query_info_free(struct v3d_timestamp_query_info *query_info,
- unsigned int count);
-void v3d_performance_query_info_free(struct v3d_performance_query_info *query_info,
- unsigned int count);
+void v3d_timestamp_query_info_free(struct v3d_timestamp_query_info *query_info);
+void v3d_performance_query_info_free(struct v3d_performance_query_info *query_info);
struct v3d_stats *v3d_stats_alloc(void);
void v3d_stats_release(struct kref *refcount);
void v3d_job_update_stats(struct v3d_job *job);
diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
index 1924e3440dc9..6ee64fbacae9 100644
--- a/drivers/gpu/drm/v3d/v3d_sched.c
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
@@ -95,34 +95,44 @@ v3d_sched_job_free(struct drm_sched_job *sched_job)
v3d_job_cleanup(job);
}

+/*
+ * The query arrays are owned by the job: they are allocated by the extension
+ * parsers in v3d_submit.c (which also publish ->count before they start
+ * filling the entries) and they are released only here, from
+ * v3d_cpu_job_free(). The arrays are zero allocated, so on a parsing failure
+ * the entries past the last one set up are all zero and get skipped.
+ */
void
-v3d_timestamp_query_info_free(struct v3d_timestamp_query_info *query_info,
- unsigned int count)
+v3d_timestamp_query_info_free(struct v3d_timestamp_query_info *query_info)
{
- if (query_info->queries) {
- unsigned int i;
+ unsigned int i;

- for (i = 0; i < count; i++)
- drm_syncobj_put(query_info->queries[i].syncobj);
+ if (!query_info->queries)
+ return;

- kvfree(query_info->queries);
+ for (i = 0; i < query_info->count; i++) {
+ if (query_info->queries[i].syncobj)
+ drm_syncobj_put(query_info->queries[i].syncobj);
}
+
+ kvfree(query_info->queries);
}

void
-v3d_performance_query_info_free(struct v3d_performance_query_info *query_info,
- unsigned int count)
+v3d_performance_query_info_free(struct v3d_performance_query_info *query_info)
{
- if (query_info->queries) {
- unsigned int i;
+ unsigned int i;

- for (i = 0; i < count; i++) {
- drm_syncobj_put(query_info->queries[i].syncobj);
- kvfree(query_info->queries[i].kperfmon_ids);
- }
+ if (!query_info->queries)
+ return;

- kvfree(query_info->queries);
+ for (i = 0; i < query_info->count; i++) {
+ kvfree(query_info->queries[i].kperfmon_ids);
+ if (query_info->queries[i].syncobj)
+ drm_syncobj_put(query_info->queries[i].syncobj);
}
+
+ kvfree(query_info->queries);
}

static void
diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
index 7548faab67ba..5087039733e8 100644
--- a/drivers/gpu/drm/v3d/v3d_submit.c
+++ b/drivers/gpu/drm/v3d/v3d_submit.c
@@ -174,11 +174,9 @@ 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_timestamp_query_info_free(&job->timestamp_query);

- v3d_performance_query_info_free(&job->performance_query,
- job->performance_query.count);
+ v3d_performance_query_info_free(&job->performance_query);

if (job->indirect_csd.indirect)
drm_gem_object_put(job->indirect_csd.indirect);
@@ -734,7 +732,6 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
struct drm_v3d_timestamp_query timestamp;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
- int err;

if (!v3d_validate_cpu_job(file_priv, job))
return -EINVAL;
@@ -747,43 +744,34 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,

job->job_type = V3D_CPU_JOB_TYPE_TIMESTAMP_QUERY;

- query_info->queries = kvmalloc_objs(struct v3d_timestamp_query,
+ query_info->queries = kvzalloc_objs(struct v3d_timestamp_query,
timestamp.count);
if (!query_info->queries)
return -ENOMEM;

+ query_info->count = timestamp.count;
+
offsets = u64_to_user_ptr(timestamp.offsets);
syncs = u64_to_user_ptr(timestamp.syncs);

for (i = 0; i < timestamp.count; i++) {
u32 offset, sync;

- if (get_user(offset, offsets++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(offset, offsets++))
+ return -EFAULT;

query_info->queries[i].offset = offset;

- if (get_user(sync, syncs++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(sync, syncs++))
+ return -EFAULT;

query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
- if (!query_info->queries[i].syncobj) {
- err = -ENOENT;
- goto error;
- }
+ if (!query_info->queries[i].syncobj)
+ return -ENOENT;
}
- query_info->count = timestamp.count;

return 0;
-
-error:
- v3d_timestamp_query_info_free(&job->timestamp_query, i);
- return err;
}

static int
@@ -795,7 +783,6 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
struct drm_v3d_reset_timestamp_query reset;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
- int err;

if (!v3d_validate_cpu_job(file_priv, job))
return -EINVAL;
@@ -805,11 +792,13 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,

job->job_type = V3D_CPU_JOB_TYPE_RESET_TIMESTAMP_QUERY;

- query_info->queries = kvmalloc_objs(struct v3d_timestamp_query,
+ query_info->queries = kvzalloc_objs(struct v3d_timestamp_query,
reset.count);
if (!query_info->queries)
return -ENOMEM;

+ query_info->count = reset.count;
+
syncs = u64_to_user_ptr(reset.syncs);

for (i = 0; i < reset.count; i++) {
@@ -817,25 +806,16 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,

query_info->queries[i].offset = reset.offset + 8 * i;

- if (get_user(sync, syncs++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(sync, syncs++))
+ return -EFAULT;

query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
- if (!query_info->queries[i].syncobj) {
- err = -ENOENT;
- goto error;
- }
+ if (!query_info->queries[i].syncobj)
+ return -ENOENT;
}
- query_info->count = reset.count;

return 0;
-
-error:
- v3d_timestamp_query_info_free(&job->timestamp_query, i);
- return err;
}

/* Get data for the copy timestamp query results job submission. */
@@ -848,7 +828,6 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
struct drm_v3d_copy_timestamp_query copy;
struct v3d_timestamp_query_info *query_info = &job->timestamp_query;
unsigned int i;
- int err;

if (!v3d_validate_cpu_job(file_priv, job))
return -EINVAL;
@@ -861,37 +840,32 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,

job->job_type = V3D_CPU_JOB_TYPE_COPY_TIMESTAMP_QUERY;

- query_info->queries = kvmalloc_objs(struct v3d_timestamp_query,
+ query_info->queries = kvzalloc_objs(struct v3d_timestamp_query,
copy.count);
if (!query_info->queries)
return -ENOMEM;

+ query_info->count = copy.count;
+
offsets = u64_to_user_ptr(copy.offsets);
syncs = u64_to_user_ptr(copy.syncs);

for (i = 0; i < copy.count; i++) {
u32 offset, sync;

- if (get_user(offset, offsets++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(offset, offsets++))
+ return -EFAULT;

query_info->queries[i].offset = offset;

- if (get_user(sync, syncs++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(sync, syncs++))
+ return -EFAULT;

query_info->queries[i].syncobj = drm_syncobj_find(file_priv,
sync);
- if (!query_info->queries[i].syncobj) {
- err = -ENOENT;
- goto error;
- }
+ if (!query_info->queries[i].syncobj)
+ return -ENOENT;
}
- query_info->count = copy.count;

job->copy.do_64bit = copy.do_64bit;
job->copy.do_partial = copy.do_partial;
@@ -900,10 +874,6 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
job->copy.stride = copy.stride;

return 0;
-
-error:
- v3d_timestamp_query_info_free(&job->timestamp_query, i);
- return err;
}

static int
@@ -915,7 +885,8 @@ v3d_copy_query_info(struct v3d_performance_query_info *query_info,
struct drm_file *file_priv)
{
unsigned int i, j;
- int err;
+
+ query_info->count = count;

for (i = 0; i < count; i++) {
struct v3d_performance_query *query = &query_info->queries[i];
@@ -923,50 +894,34 @@ v3d_copy_query_info(struct v3d_performance_query_info *query_info,
u32 sync, id;
u64 ids;

- if (get_user(sync, syncs++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(sync, syncs++))
+ return -EFAULT;

- if (get_user(ids, kperfmon_ids++)) {
- err = -EFAULT;
- goto error;
- }
+ if (get_user(ids, kperfmon_ids++))
+ return -EFAULT;

query->kperfmon_ids =
kvmalloc_array(nperfmons,
sizeof(struct v3d_performance_query *),
GFP_KERNEL);
- if (!query->kperfmon_ids) {
- err = -ENOMEM;
- goto error;
- }
+ if (!query->kperfmon_ids)
+ return -ENOMEM;

ids_pointer = u64_to_user_ptr(ids);

for (j = 0; j < nperfmons; j++) {
- if (get_user(id, ids_pointer++)) {
- kvfree(query->kperfmon_ids);
- err = -EFAULT;
- goto error;
- }
+ if (get_user(id, ids_pointer++))
+ return -EFAULT;

query->kperfmon_ids[j] = id;
}

query->syncobj = drm_syncobj_find(file_priv, sync);
- if (!query->syncobj) {
- kvfree(query->kperfmon_ids);
- err = -ENOENT;
- goto error;
- }
+ if (!query->syncobj)
+ return -ENOENT;
}

return 0;
-
-error:
- v3d_performance_query_info_free(query_info, i);
- return err;
}

static int
@@ -987,7 +942,7 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_RESET_PERFORMANCE_QUERY;

query_info->queries =
- kvmalloc_objs(struct v3d_performance_query, reset.count);
+ kvzalloc_objs(struct v3d_performance_query, reset.count);
if (!query_info->queries)
return -ENOMEM;

@@ -1000,7 +955,6 @@ v3d_get_cpu_reset_performance_params(struct drm_file *file_priv,
if (err)
return err;

- query_info->count = reset.count;
query_info->nperfmons = reset.nperfmons;

return 0;
@@ -1027,7 +981,7 @@ v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
job->job_type = V3D_CPU_JOB_TYPE_COPY_PERFORMANCE_QUERY;

query_info->queries =
- kvmalloc_objs(struct v3d_performance_query, copy.count);
+ kvzalloc_objs(struct v3d_performance_query, copy.count);
if (!query_info->queries)
return -ENOMEM;

@@ -1040,7 +994,6 @@ v3d_get_cpu_copy_performance_query_params(struct drm_file *file_priv,
if (err)
return err;

- query_info->count = copy.count;
query_info->nperfmons = copy.nperfmons;
query_info->ncounters = copy.ncounters;

--
2.34.1