]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/query: Fix topology query pointer advance
authorShuicheng Lin <shuicheng.lin@intel.com>
Fri, 30 Jan 2026 04:39:08 +0000 (04:39 +0000)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Wed, 4 Feb 2026 15:40:36 +0000 (16:40 +0100)
The topology query helper advanced the user pointer by the size
of the pointer, not the size of the structure. This can misalign
the output blob and corrupt the following mask. Fix the increment
to use sizeof(*topo).
There is no issue currently, as sizeof(*topo) happens to be equal
to sizeof(topo) on 64-bit systems (both evaluate to 8 bytes).

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patch.msgid.link/20260130043907.465128-2-shuicheng.lin@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
(cherry picked from commit c2a6859138e7f73ad904be17dd7d1da6cc7f06b3)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_query.c

index 1c0915e2cc16ed8bdb035d0aac23f74474b51e06..fde36280e14d3ef6c845b13f43f015ff0bb9a00f 100644 (file)
@@ -491,7 +491,7 @@ static int copy_mask(void __user **ptr,
 
        if (copy_to_user(*ptr, topo, sizeof(*topo)))
                return -EFAULT;
-       *ptr += sizeof(topo);
+       *ptr += sizeof(*topo);
 
        if (copy_to_user(*ptr, mask, mask_size))
                return -EFAULT;