diff options
| author | Felix Kuehling <Felix.Kuehling@amd.com> | 2023-10-31 13:30:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 17:20:17 +0000 |
| commit | 5e4d9fda7e65cd267900f7d2c7c1579a98bf413c (patch) | |
| tree | 1cb89f34bc102402608988664a8cb4bf9ccfbe8a /drivers | |
| parent | c0707623d46021262e68e6aa9e2111ba84593412 (diff) | |
| download | linux-stable-5e4d9fda7e65cd267900f7d2c7c1579a98bf413c.tar.gz linux-stable-5e4d9fda7e65cd267900f7d2c7c1579a98bf413c.tar.bz2 linux-stable-5e4d9fda7e65cd267900f7d2c7c1579a98bf413c.zip | |
drm/amdgpu: Fix possible null pointer dereference
commit 256503071c2de2b5b5c20e06654aa9a44f13aa62 upstream.
mem = bo->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>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 9ab87a55c8da..89c8e51cd332 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1095,8 +1095,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, bo = gem_to_amdgpu_bo(gobj); } mem = bo->tbo.resource; - if (mem->mem_type == TTM_PL_TT || - mem->mem_type == AMDGPU_PL_PREEMPT) + if (mem && (mem->mem_type == TTM_PL_TT || + mem->mem_type == AMDGPU_PL_PREEMPT)) pages_addr = bo->tbo.ttm->dma_address; } |