* [PATCH] drm/amd/display: Fix potential null dereference
@ 2023-04-03 13:10 Igor Artemiev
2023-04-05 18:29 ` Hamza Mahfooz
0 siblings, 1 reply; 2+ messages in thread
From: Igor Artemiev @ 2023-04-03 13:10 UTC (permalink / raw)
To: David Airlie
Cc: Igor Artemiev, Daniel Vetter, Rodrigo Siqueira, Alex Deucher,
Harry Wentland, Nicholas Kazlauskas, amd-gfx, dri-devel,
linux-kernel, lvc-project
The adev->dm.dc pointer can be NULL and dereferenced in amdgpu_dm_fini()
without checking.
Add a NULL pointer check before calling dc_dmub_srv_destroy().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 9a71c7d31734 ("drm/amd/display: Register DMUB service with DC")
Signed-off-by: Igor Artemiev <Igor.A.Artemiev@mcst.ru>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a01fd41643fc..27f7a554874e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1854,7 +1854,8 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
dc_deinit_callbacks(adev->dm.dc);
#endif
- dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
+ if (adev->dm.dc)
+ dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
if (dc_enable_dmub_notifications(adev->dm.dc)) {
kfree(adev->dm.dmub_notify);
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amd/display: Fix potential null dereference
2023-04-03 13:10 [PATCH] drm/amd/display: Fix potential null dereference Igor Artemiev
@ 2023-04-05 18:29 ` Hamza Mahfooz
0 siblings, 0 replies; 2+ messages in thread
From: Hamza Mahfooz @ 2023-04-05 18:29 UTC (permalink / raw)
To: Igor Artemiev, David Airlie
Cc: lvc-project, Harry Wentland, Rodrigo Siqueira, linux-kernel,
amd-gfx, dri-devel, Daniel Vetter, Alex Deucher,
Nicholas Kazlauskas
On 4/3/23 09:10, Igor Artemiev wrote:
> The adev->dm.dc pointer can be NULL and dereferenced in amdgpu_dm_fini()
> without checking.
>
> Add a NULL pointer check before calling dc_dmub_srv_destroy().
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 9a71c7d31734 ("drm/amd/display: Register DMUB service with DC")
> Signed-off-by: Igor Artemiev <Igor.A.Artemiev@mcst.ru>
Applied, thanks!
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index a01fd41643fc..27f7a554874e 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1854,7 +1854,8 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
> dc_deinit_callbacks(adev->dm.dc);
> #endif
>
> - dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
> + if (adev->dm.dc)
> + dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv);
>
> if (dc_enable_dmub_notifications(adev->dm.dc)) {
> kfree(adev->dm.dmub_notify);
--
Hamza
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-05 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-03 13:10 [PATCH] drm/amd/display: Fix potential null dereference Igor Artemiev
2023-04-05 18:29 ` Hamza Mahfooz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®