* [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
@ 2024-05-14 7:06 Friedrich Vock
2024-05-14 7:21 ` Christian König
0 siblings, 1 reply; 4+ messages in thread
From: Friedrich Vock @ 2024-05-14 7:06 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher, Christian König
The special case for VM passthrough doesn't check adev->nbio.funcs
before dereferencing it. If GPUs that don't have an NBIO block are
passed through, this leads to a NULL pointer dereference on startup.
Signed-off-by: Friedrich Vock <friedrich.vock@gmx.de>
Fixes: 1bece222eab ("drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid")
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 861ccff78af95..83c4533ee75c8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -6165,7 +6165,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev)
adev->nbio.funcs->enable_doorbell_interrupt)
adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
- if (amdgpu_passthrough(adev) &&
+ if (amdgpu_passthrough(adev) && adev->nbio.funcs &&
adev->nbio.funcs->clear_doorbell_interrupt)
adev->nbio.funcs->clear_doorbell_interrupt(adev);
--
2.45.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
2024-05-14 7:06 [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit Friedrich Vock
@ 2024-05-14 7:21 ` Christian König
2024-05-14 13:57 ` Alex Deucher
0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2024-05-14 7:21 UTC (permalink / raw)
To: Friedrich Vock, amd-gfx; +Cc: Alex Deucher
Am 14.05.24 um 09:06 schrieb Friedrich Vock:
> The special case for VM passthrough doesn't check adev->nbio.funcs
> before dereferencing it. If GPUs that don't have an NBIO block are
> passed through, this leads to a NULL pointer dereference on startup.
>
> Signed-off-by: Friedrich Vock <friedrich.vock@gmx.de>
Acked-by: Christian König <christian.koenig@amd.com>
>
> Fixes: 1bece222eab ("drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid")
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 861ccff78af95..83c4533ee75c8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -6165,7 +6165,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev)
> adev->nbio.funcs->enable_doorbell_interrupt)
> adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
>
> - if (amdgpu_passthrough(adev) &&
> + if (amdgpu_passthrough(adev) && adev->nbio.funcs &&
> adev->nbio.funcs->clear_doorbell_interrupt)
> adev->nbio.funcs->clear_doorbell_interrupt(adev);
>
> --
> 2.45.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
2024-05-14 7:21 ` Christian König
@ 2024-05-14 13:57 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2024-05-14 13:57 UTC (permalink / raw)
To: Christian König; +Cc: Friedrich Vock, amd-gfx, Alex Deucher
Applied. Thanks!
On Tue, May 14, 2024 at 3:27 AM Christian König
<christian.koenig@amd.com> wrote:
>
> Am 14.05.24 um 09:06 schrieb Friedrich Vock:
> > The special case for VM passthrough doesn't check adev->nbio.funcs
> > before dereferencing it. If GPUs that don't have an NBIO block are
> > passed through, this leads to a NULL pointer dereference on startup.
> >
> > Signed-off-by: Friedrich Vock <friedrich.vock@gmx.de>
>
> Acked-by: Christian König <christian.koenig@amd.com>
>
> >
> > Fixes: 1bece222eab ("drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid")
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Cc: Christian König <christian.koenig@amd.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 861ccff78af95..83c4533ee75c8 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -6165,7 +6165,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev)
> > adev->nbio.funcs->enable_doorbell_interrupt)
> > adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
> >
> > - if (amdgpu_passthrough(adev) &&
> > + if (amdgpu_passthrough(adev) && adev->nbio.funcs &&
> > adev->nbio.funcs->clear_doorbell_interrupt)
> > adev->nbio.funcs->clear_doorbell_interrupt(adev);
> >
> > --
> > 2.45.0
> >
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
@ 2024-08-15 14:17 Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2024-08-15 14:17 UTC (permalink / raw)
To: stable, gregkh, sashal; +Cc: Friedrich Vock, Alex Deucher, Christian König
From: Friedrich Vock <friedrich.vock@gmx.de>
The special case for VM passthrough doesn't check adev->nbio.funcs
before dereferencing it. If GPUs that don't have an NBIO block are
passed through, this leads to a NULL pointer dereference on startup.
Signed-off-by: Friedrich Vock <friedrich.vock@gmx.de>
Fixes: 1bece222eabe ("drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid")
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3558
Cc: stable@vger.kernel.org # 5.15.x
(cherry picked from commit 0cdb3f9740844b9d95ca413e3fcff11f81223ecf)
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5f6c32ec674d..300d3b236bb3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -5531,7 +5531,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev)
adev->nbio.funcs->enable_doorbell_interrupt)
adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
- if (amdgpu_passthrough(adev) &&
+ if (amdgpu_passthrough(adev) && adev->nbio.funcs &&
adev->nbio.funcs->clear_doorbell_interrupt)
adev->nbio.funcs->clear_doorbell_interrupt(adev);
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-15 14:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 7:06 [PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit Friedrich Vock
2024-05-14 7:21 ` Christian König
2024-05-14 13:57 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 14:17 Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.