]> Git Repo - linux.git/commitdiff
drm/ttm: Fix a NULL pointer dereference
authorThomas Hellström <[email protected]>
Tue, 7 Mar 2023 14:46:15 +0000 (15:46 +0100)
committerThomas Hellström <[email protected]>
Tue, 7 Mar 2023 17:26:38 +0000 (18:26 +0100)
The LRU mechanism may look up a resource in the process of being removed
from an object. The locking rules here are a bit unclear but it looks
currently like res->bo assignment is protected by the LRU lock, whereas
bo->resource is protected by the object lock, while *clearing* of
bo->resource is also protected by the LRU lock. This means that if
we check that bo->resource points to the LRU resource under the LRU
lock we should be safe.
So perform that check before deciding to swap out a bo. That avoids
dereferencing a NULL bo->resource in ttm_bo_swapout().

Fixes: 6a9b02899402 ("drm/ttm: move the LRU into resource handling v4")
Cc: Christian König <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Christian Koenig <[email protected]>
Cc: Huang Rui <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Felix Kuehling <[email protected]>
Cc: Philip Yang <[email protected]>
Cc: Qiang Yu <[email protected]>
Cc: Matthew Auld <[email protected]>
Cc: Nirmoy Das <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: "Thomas Hellström" <[email protected]>
Cc: Anshuman Gupta <[email protected]>
Cc: Arunpravin Paneer Selvam <[email protected]>
Cc: [email protected]
Cc: <[email protected]> # v5.19+
Signed-off-by: Thomas Hellström <[email protected]>
Reviewed-by: Christian König <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/ttm/ttm_device.c

index e7147e30463789272311313359abccc2934d9436..b84f74807ca1329104d16ae7b203763732c8aaa8 100644 (file)
@@ -158,7 +158,7 @@ int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx,
                        struct ttm_buffer_object *bo = res->bo;
                        uint32_t num_pages;
 
-                       if (!bo)
+                       if (!bo || bo->resource != res)
                                continue;
 
                        num_pages = PFN_UP(bo->base.size);
This page took 0.049195 seconds and 4 git commands to generate.