[PATCH 5.10] drm/radeon: check bo_va->bo is non-NULL before using it
Denis Arefev
arefev at swemel.ru
Mon Jan 20 12:45:09 UTC 2025
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
commit 6fb15dcbcf4f212930350eaee174bb60ed40a536 upstream.
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 at amd.com>
Acked-by: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
[Denis: minor fix to resolve merge conflict.]
Signed-off-by: Denis Arefev <arefev at swemel.ru>
---
Backport fix CVE-2024-41060
Link: https://nvd.nist.gov/vuln/detail/CVE-2024-41060
---
drivers/gpu/drm/radeon/radeon_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 75053917d213..51b6f38b5c47 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -582,7 +582,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.mem);
error_unlock:
--
2.43.0
More information about the dri-devel
mailing list