* [PATCH] drm/i915/gt: Potential error pointer dereference in pinned_context()
@ 2021-08-13 11:36 Dan Carpenter
2021-08-13 14:01 ` Thomas Hellström
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2021-08-13 11:36 UTC (permalink / raw)
To: Jani Nikula, Chris Wilson
Cc: Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter,
Matthew Auld, Thomas Hellström, Jason Ekstrand,
Lucas De Marchi, intel-gfx, dri-devel, kernel-janitors
If the intel_engine_create_pinned_context() function returns an error
pointer, then dereferencing "ce" will Oops. Use "vm" instead of
"ce->vm".
Fixes: cf586021642d ("drm/i915/gt: Pipelined page migration")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
index d0a7c934fd3b..1dac21aa7e5c 100644
--- a/drivers/gpu/drm/i915/gt/intel_migrate.c
+++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
@@ -177,7 +177,7 @@ static struct intel_context *pinned_context(struct intel_gt *gt)
ce = intel_engine_create_pinned_context(engine, vm, SZ_512K,
I915_GEM_HWS_MIGRATE,
&key, "migrate");
- i915_vm_put(ce->vm);
+ i915_vm_put(vm);
return ce;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915/gt: Potential error pointer dereference in pinned_context()
2021-08-13 11:36 [PATCH] drm/i915/gt: Potential error pointer dereference in pinned_context() Dan Carpenter
@ 2021-08-13 14:01 ` Thomas Hellström
2021-08-20 16:34 ` Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Hellström @ 2021-08-13 14:01 UTC (permalink / raw)
To: Dan Carpenter, Jani Nikula, Chris Wilson
Cc: Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter,
Matthew Auld, Jason Ekstrand, Lucas De Marchi, intel-gfx,
dri-devel, kernel-janitors
On 8/13/21 1:36 PM, Dan Carpenter wrote:
> If the intel_engine_create_pinned_context() function returns an error
> pointer, then dereferencing "ce" will Oops. Use "vm" instead of
> "ce->vm".
>
> Fixes: cf586021642d ("drm/i915/gt: Pipelined page migration")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> index d0a7c934fd3b..1dac21aa7e5c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> @@ -177,7 +177,7 @@ static struct intel_context *pinned_context(struct intel_gt *gt)
> ce = intel_engine_create_pinned_context(engine, vm, SZ_512K,
> I915_GEM_HWS_MIGRATE,
> &key, "migrate");
> - i915_vm_put(ce->vm);
> + i915_vm_put(vm);
> return ce;
> }
>
Thanks,
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915/gt: Potential error pointer dereference in pinned_context()
2021-08-13 14:01 ` Thomas Hellström
@ 2021-08-20 16:34 ` Rodrigo Vivi
0 siblings, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2021-08-20 16:34 UTC (permalink / raw)
To: Thomas Hellström
Cc: Dan Carpenter, Jani Nikula, Chris Wilson, Joonas Lahtinen,
David Airlie, Daniel Vetter, Matthew Auld, Jason Ekstrand,
Lucas De Marchi, intel-gfx, dri-devel, kernel-janitors
On Fri, Aug 13, 2021 at 04:01:06PM +0200, Thomas Hellström wrote:
>
> On 8/13/21 1:36 PM, Dan Carpenter wrote:
> > If the intel_engine_create_pinned_context() function returns an error
> > pointer, then dereferencing "ce" will Oops. Use "vm" instead of
> > "ce->vm".
> >
> > Fixes: cf586021642d ("drm/i915/gt: Pipelined page migration")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> > index d0a7c934fd3b..1dac21aa7e5c 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> > @@ -177,7 +177,7 @@ static struct intel_context *pinned_context(struct intel_gt *gt)
> > ce = intel_engine_create_pinned_context(engine, vm, SZ_512K,
> > I915_GEM_HWS_MIGRATE,
> > &key, "migrate");
> > - i915_vm_put(ce->vm);
> > + i915_vm_put(vm);
> > return ce;
> > }
>
> Thanks,
>
> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
And pushed to drm-intel-gt-next, thanks for the patch and review.
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-20 16:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-13 11:36 [PATCH] drm/i915/gt: Potential error pointer dereference in pinned_context() Dan Carpenter
2021-08-13 14:01 ` Thomas Hellström
2021-08-20 16:34 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox