]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/ttm: Avoid NULL pointer deref for evicted BOs
authorSimon Richter <Simon.Richter@hogyros.de>
Mon, 13 Oct 2025 16:11:33 +0000 (01:11 +0900)
committerMatthew Brost <matthew.brost@intel.com>
Mon, 8 Dec 2025 20:07:48 +0000 (12:07 -0800)
It is possible for a BO to exist that is not currently associated with a
resource, e.g. because it has been evicted.

When devcoredump tries to read the contents of all BOs for dumping, we need
to expect this as well -- in this case, ENODATA is recorded instead of the
buffer contents.

Fixes: 7d08df5d0bd3 ("drm/ttm: Add ttm_bo_access")
Fixes: 09ac4fcb3f25 ("drm/ttm: Implement vm_operations_struct.access v2")
Cc: stable <stable@kernel.org>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6271
Signed-off-by: Simon Richter <Simon.Richter@hogyros.de>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Shuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20251013161241.709916-1-Simon.Richter@hogyros.de
drivers/gpu/drm/ttm/ttm_bo_vm.c

index b47020fca199230b29dda6d527793f4f4a8ebb11..e6abc7b40b1895b08ff82ca506b74ecf44f8ce50 100644 (file)
@@ -434,6 +434,11 @@ int ttm_bo_access(struct ttm_buffer_object *bo, unsigned long offset,
        if (ret)
                return ret;
 
+       if (!bo->resource) {
+               ret = -ENODATA;
+               goto unlock;
+       }
+
        switch (bo->resource->mem_type) {
        case TTM_PL_SYSTEM:
                fallthrough;
@@ -448,6 +453,7 @@ int ttm_bo_access(struct ttm_buffer_object *bo, unsigned long offset,
                        ret = -EIO;
        }
 
+unlock:
        ttm_bo_unreserve(bo);
 
        return ret;