Commit fde8b7f5 authored Dec 03, 2023 by Felix Kuehling Committed by Zheng Zengkai Dec 03, 2023

drm/amdgpu: Fix possible null pointer dereference

stable inclusion
from stable-v6.6.3
commit 5e4d9fda7e65cd267900f7d2c7c1579a98bf413c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LBQP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5e4d9fda7e65cd267900f7d2c7c1579a98bf413c



--------------------------------

commit 256503071c2de2b5b5c20e06654aa9a44f13aa62 upstream.

mem = bo->tbo.resource may be NULL in amdgpu_vm_bo_update.

Fixes: 18025378 ("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>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 7843a3bb

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}