From: Tvrtko Ursulin <tvrtko.ursu...@igalia.com>

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 successfuly or otherwise fail the
extension by jumping into the existing unwind.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@igalia.com>
Fixes: 9ba0ff3e083f ("drm/v3d: Create a CPU job extension for the timestamp 
query job")
Cc: MaĆ­ra Canal <mca...@igalia.com>
Cc: Iago Toral Quiroga <ito...@igalia.com>
Cc: <sta...@vger.kernel.org> # v6.8+
---
 drivers/gpu/drm/v3d/v3d_submit.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
index 81afcfccc6bb..a408db3d3e32 100644
--- a/drivers/gpu/drm/v3d/v3d_submit.c
+++ b/drivers/gpu/drm/v3d/v3d_submit.c
@@ -499,6 +499,10 @@ v3d_get_cpu_timestamp_query_params(struct drm_file 
*file_priv,
                }
 
                qinfo->queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!qinfo->queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        qinfo->count = timestamp.count;
 
@@ -554,6 +558,10 @@ v3d_get_cpu_reset_timestamp_params(struct drm_file 
*file_priv,
                }
 
                qinfo->queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!qinfo->queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        qinfo->count = reset.count;
 
@@ -619,6 +627,10 @@ v3d_get_cpu_copy_query_results_params(struct drm_file 
*file_priv,
                }
 
                qinfo->queries[i].syncobj = drm_syncobj_find(file_priv, sync);
+               if (!qinfo->queries[i].syncobj) {
+                       err = -ENOENT;
+                       goto error;
+               }
        }
        qinfo->count = copy.count;
 
-- 
2.44.0

Reply via email to