* [PATCH][next] drm/xe/guc: Fix inverted logic on snapshot->copy check
@ 2024-10-09 16:05 Colin Ian King
2024-10-09 16:32 ` John Harrison
0 siblings, 1 reply; 3+ messages in thread
From: Colin Ian King @ 2024-10-09 16:05 UTC (permalink / raw)
To: Lucas De Marchi, Thomas Hellström, Rodrigo Vivi,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, Julia Filipchuk, John Harrison, intel-xe,
dri-devel
Cc: kernel-janitors, linux-kernel
Currently the check to see if snapshot->copy has been allocated is
inverted and ends up dereferencing snapshot->copy when free'ing
objects in the array when it is null or not free'ing the objects
when snapshot->copy is allocated. Fix this by using the correct
non-null pointer check logic.
Fixes: d8ce1a977226 ("drm/xe/guc: Use a two stage dump for GuC logs and add more info")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
drivers/gpu/drm/xe/xe_guc_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
index 93921f04153f..cc70f448d879 100644
--- a/drivers/gpu/drm/xe/xe_guc_log.c
+++ b/drivers/gpu/drm/xe/xe_guc_log.c
@@ -122,7 +122,7 @@ void xe_guc_log_snapshot_free(struct xe_guc_log_snapshot *snapshot)
if (!snapshot)
return;
- if (!snapshot->copy) {
+ if (snapshot->copy) {
for (i = 0; i < snapshot->num_chunks; i++)
kfree(snapshot->copy[i]);
kfree(snapshot->copy);
--
2.39.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] drm/xe/guc: Fix inverted logic on snapshot->copy check
2024-10-09 16:05 [PATCH][next] drm/xe/guc: Fix inverted logic on snapshot->copy check Colin Ian King
@ 2024-10-09 16:32 ` John Harrison
2024-10-10 12:57 ` Thomas Hellström
0 siblings, 1 reply; 3+ messages in thread
From: John Harrison @ 2024-10-09 16:32 UTC (permalink / raw)
To: Colin Ian King, Lucas De Marchi, Thomas Hellström,
Rodrigo Vivi, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, Julia Filipchuk, intel-xe, dri-devel
Cc: kernel-janitors, linux-kernel
On 10/9/2024 09:05, Colin Ian King wrote:
> Currently the check to see if snapshot->copy has been allocated is
> inverted and ends up dereferencing snapshot->copy when free'ing
> objects in the array when it is null or not free'ing the objects
> when snapshot->copy is allocated. Fix this by using the correct
> non-null pointer check logic.
>
> Fixes: d8ce1a977226 ("drm/xe/guc: Use a two stage dump for GuC logs and add more info")
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Thanks for the fix.
> ---
> drivers/gpu/drm/xe/xe_guc_log.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
> index 93921f04153f..cc70f448d879 100644
> --- a/drivers/gpu/drm/xe/xe_guc_log.c
> +++ b/drivers/gpu/drm/xe/xe_guc_log.c
> @@ -122,7 +122,7 @@ void xe_guc_log_snapshot_free(struct xe_guc_log_snapshot *snapshot)
> if (!snapshot)
> return;
>
> - if (!snapshot->copy) {
> + if (snapshot->copy) {
> for (i = 0; i < snapshot->num_chunks; i++)
> kfree(snapshot->copy[i]);
> kfree(snapshot->copy);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] drm/xe/guc: Fix inverted logic on snapshot->copy check
2024-10-09 16:32 ` John Harrison
@ 2024-10-10 12:57 ` Thomas Hellström
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Hellström @ 2024-10-10 12:57 UTC (permalink / raw)
To: John Harrison, Colin Ian King, Lucas De Marchi, Rodrigo Vivi,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, Julia Filipchuk, intel-xe, dri-devel
Cc: kernel-janitors, linux-kernel
On Wed, 2024-10-09 at 09:32 -0700, John Harrison wrote:
> On 10/9/2024 09:05, Colin Ian King wrote:
> > Currently the check to see if snapshot->copy has been allocated is
> > inverted and ends up dereferencing snapshot->copy when free'ing
> > objects in the array when it is null or not free'ing the objects
> > when snapshot->copy is allocated. Fix this by using the correct
> > non-null pointer check logic.
> >
> > Fixes: d8ce1a977226 ("drm/xe/guc: Use a two stage dump for GuC logs
> > and add more info")
> > Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
>
> Thanks for the fix.
Pushed to drm-xe-next. Thanks.
/Thomas
>
> > ---
> > drivers/gpu/drm/xe/xe_guc_log.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/xe/xe_guc_log.c
> > b/drivers/gpu/drm/xe/xe_guc_log.c
> > index 93921f04153f..cc70f448d879 100644
> > --- a/drivers/gpu/drm/xe/xe_guc_log.c
> > +++ b/drivers/gpu/drm/xe/xe_guc_log.c
> > @@ -122,7 +122,7 @@ void xe_guc_log_snapshot_free(struct
> > xe_guc_log_snapshot *snapshot)
> > if (!snapshot)
> > return;
> >
> > - if (!snapshot->copy) {
> > + if (snapshot->copy) {
> > for (i = 0; i < snapshot->num_chunks; i++)
> > kfree(snapshot->copy[i]);
> > kfree(snapshot->copy);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-10 12:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-09 16:05 [PATCH][next] drm/xe/guc: Fix inverted logic on snapshot->copy check Colin Ian King
2024-10-09 16:32 ` John Harrison
2024-10-10 12:57 ` Thomas Hellström
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox