]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/query: fix gt_id bounds check
authorMatthew Auld <matthew.auld@intel.com>
Thu, 21 Mar 2024 11:06:30 +0000 (11:06 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:32:41 +0000 (15:32 +0200)
commit 45c30b2923e5c53e0ef057a8a525b0456adde18e upstream.

The user provided gt_id should always be less than the
XE_MAX_GT_PER_TILE.

Fixes: 7793d00d1bf5 ("drm/xe: Correlate engine and cpu timestamps with better accuracy")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Cc: <stable@vger.kernel.org> # v6.8+
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Acked-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240321110629.334701-2-matthew.auld@intel.com
(cherry picked from commit 4b275f502a0d3668195762fb55fa00e659ad1b0b)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/xe_query.c

index 7e924faeeea0b0f8ebc2f7fe89ade231412a3892..1a6f2f51baae6b096c85c3990fedda793605abc9 100644 (file)
@@ -132,7 +132,7 @@ query_engine_cycles(struct xe_device *xe,
                return -EINVAL;
 
        eci = &resp.eci;
-       if (eci->gt_id > XE_MAX_GT_PER_TILE)
+       if (eci->gt_id >= XE_MAX_GT_PER_TILE)
                return -EINVAL;
 
        gt = xe_device_get_gt(xe, eci->gt_id);