Commit 58442f0d authored by Christian König's avatar Christian König
Browse files

drm/ttm: fix invalid NULL deref 



The BO might be NULL in this function, use the bdev directly.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarColin Ian King <colin.king@canonical.com>
Fixes: a1f091f8 ("drm/ttm: switch to per device LRU lock")
Link: https://patchwork.freedesktop.org/patch/msgid/20210325152740.82633-1-christian.koenig@amd.com
parent 30e2ae94

drivers/gpu/drm/ttm/ttm_bo.c

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ int ttm_mem_evict_first(struct ttm_device *bdev, 
	unsigned i;

	int ret;



	spin_lock(&bo->bdev->lru_lock);

	spin_lock(&bdev->lru_lock);

	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {

		list_for_each_entry(bo, &man->lru[i], lru) {

			bool busy;
@@ -662,7 +662,7 @@ int ttm_mem_evict_first(struct ttm_device *bdev, 
	if (!bo) {

		if (busy_bo && !ttm_bo_get_unless_zero(busy_bo))

			busy_bo = NULL;

		spin_unlock(&bo->bdev->lru_lock);

		spin_unlock(&bdev->lru_lock);

		ret = ttm_mem_evict_wait_busy(busy_bo, ctx, ticket);

		if (busy_bo)

			ttm_bo_put(busy_bo);
@@ -676,7 +676,7 @@ int ttm_mem_evict_first(struct ttm_device *bdev, 
		return ret;

	}



	spin_unlock(&bo->bdev->lru_lock);

	spin_unlock(&bdev->lru_lock);



	ret = ttm_bo_evict(bo, ctx);

	if (locked)