summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>2024-06-25 14:31:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-07-25 09:49:18 +0200
commita9100f17428cb733c4f6fbb132d98bed76318342 (patch)
tree4a36ce195574ea50dbfeb26f93e67a6b4caf5824
parentbcb649718816dc8776254b7811eb1ae63a9d3cc9 (diff)
downloadlinux-a9100f17428cb733c4f6fbb132d98bed76318342.tar.gz
linux-a9100f17428cb733c4f6fbb132d98bed76318342.tar.bz2
linux-a9100f17428cb733c4f6fbb132d98bed76318342.zip
drm/radeon: check bo_va->bo is non-NULL before using it
[ Upstream commit 6fb15dcbcf4f212930350eaee174bb60ed40a536 ] The call to radeon_vm_clear_freed might clear bo_va->bo, so we have to check it before dereferencing it. Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpu/drm/radeon/radeon_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 75d79c311038..3388a3d21d2c 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -657,7 +657,7 @@ static void radeon_gem_va_update_vm(struct radeon_device *rdev,
if (r)
goto error_unlock;
- if (bo_va->it.start)
+ if (bo_va->it.start && bo_va->bo)
r = radeon_vm_bo_update(rdev, bo_va, bo_va->bo->tbo.resource);
error_unlock: