| From 4a407c91c556f62393f5655366ff6393e7ed8602 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 17 Oct 2023 16:51:03 -0400 |
| Subject: drm/amdgpu: Fix possible null pointer dereference |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Felix Kuehling <Felix.Kuehling@amd.com> |
| |
| [ Upstream commit 51b79f33817544e3b4df838d86e8e8e4388ff684 ] |
| |
| abo->tbo.resource may be NULL in amdgpu_vm_bo_update. |
| |
| Fixes: 180253782038 ("drm/ttm: stop allocating dummy resources during BO creation") |
| Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> |
| Reviewed-by: Christian Kรถnig <christian.koenig@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |
| index ec1ec08d40584..7a67bb1490159 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |
| @@ -1094,7 +1094,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, |
| struct drm_gem_object *gobj = dma_buf->priv; |
| struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj); |
| |
| - if (abo->tbo.resource->mem_type == TTM_PL_VRAM) |
| + if (abo->tbo.resource && |
| + abo->tbo.resource->mem_type == TTM_PL_VRAM) |
| bo = gem_to_amdgpu_bo(gobj); |
| } |
| mem = bo->tbo.resource; |
| -- |
| 2.42.0 |
| |
