]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/v3d: Validate passed in drm syncobj handles in the timestamp extension
authorTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Thu, 11 Jul 2024 13:53:33 +0000 (14:53 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 18 Jul 2024 13:49:55 +0000 (15:49 +0200)
If userspace provides an unknown or invalid handle anywhere in the handle
array the rest of the driver will not handle that well.

Fix it by checking handle was looked up successfully or otherwise fail the
extension by jumping into the existing unwind.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp query job")
Cc: Maíra Canal <mcanal@igalia.com>
Cc: Iago Toral Quiroga <itoral@igalia.com>
Cc: stable@vger.kernel.org # v6.8+
Reviewed-by: Maíra Canal <mcanal@igalia.com>
Signed-off-by: Maíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711135340.84617-5-tursulin@igalia.com
(cherry picked from commit 8d1276d1b8f738c3afe1457d4dff5cc66fc848a3)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
drivers/gpu/drm/v3d/v3d_submit.c

index 50be4e8a75126d4865ed44057101fd1c73bd129f..9a3e32075ebeb9918197abcef4d8b358de4aca0c 100644 (file)
@@ -498,6 +498,10 @@ v3d_get_cpu_timestamp_query_params(struct drm_file *file_priv,
                }
 
                job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!job->timestamp_query.queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        job->timestamp_query.count = timestamp.count;
 
@@ -552,6 +556,10 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file *file_priv,
                }
 
                job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!job->timestamp_query.queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        job->timestamp_query.count = reset.count;
 
@@ -616,6 +624,10 @@ v3d_get_cpu_copy_query_results_params(struct drm_file *file_priv,
                }
 
                job->timestamp_query.queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!job->timestamp_query.queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        job->timestamp_query.count = copy.count;