* [patch] drm/i915: memory leak in __i915_gem_vma_create()
@ 2015-03-18 8:21 Dan Carpenter
2015-03-18 8:36 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2015-03-18 8:21 UTC (permalink / raw)
To: Daniel Vetter, Joonas Lahtinen
Cc: David Airlie, intel-gfx, kernel-janitors, dri-devel
In the original code then if WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)
was true then we leak "vma". Presumably that doesn't happen often but
static checkers complain and this bug is easy to fix.
Fixes: c3bbb6f2825d ('drm/i915: Do not use ggtt_view with (aliasing) PPGTT')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index f1b9ea6..cbf013f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2340,12 +2340,13 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_ggtt_view *ggtt_view)
{
- struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL);
- if (vma = NULL)
- return ERR_PTR(-ENOMEM);
+ struct i915_vma *vma;
if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view))
return ERR_PTR(-EINVAL);
+ vma = kzalloc(sizeof(*vma), GFP_KERNEL);
+ if (vma = NULL)
+ return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&vma->vma_link);
INIT_LIST_HEAD(&vma->mm_list);
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] drm/i915: memory leak in __i915_gem_vma_create() 2015-03-18 8:21 [patch] drm/i915: memory leak in __i915_gem_vma_create() Dan Carpenter @ 2015-03-18 8:36 ` Jani Nikula 2015-03-18 8:41 ` [Intel-gfx] " Daniel Vetter 0 siblings, 1 reply; 4+ messages in thread From: Jani Nikula @ 2015-03-18 8:36 UTC (permalink / raw) To: Dan Carpenter, Daniel Vetter, Joonas Lahtinen Cc: David Airlie, intel-gfx, kernel-janitors, dri-devel On Wed, 18 Mar 2015, Dan Carpenter <dan.carpenter@oracle.com> wrote: > In the original code then if WARN_ON(i915_is_ggtt(vm) != !!ggtt_view) > was true then we leak "vma". Presumably that doesn't happen often but > static checkers complain and this bug is easy to fix. > > Fixes: c3bbb6f2825d ('drm/i915: Do not use ggtt_view with (aliasing) PPGTT') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index f1b9ea6..cbf013f 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -2340,12 +2340,13 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj, > struct i915_address_space *vm, > const struct i915_ggtt_view *ggtt_view) > { > - struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL); > - if (vma = NULL) > - return ERR_PTR(-ENOMEM); > + struct i915_vma *vma; > > if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)) > return ERR_PTR(-EINVAL); > + vma = kzalloc(sizeof(*vma), GFP_KERNEL); > + if (vma = NULL) > + return ERR_PTR(-ENOMEM); > > INIT_LIST_HEAD(&vma->vma_link); > INIT_LIST_HEAD(&vma->mm_list); -- Jani Nikula, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [patch] drm/i915: memory leak in __i915_gem_vma_create() 2015-03-18 8:36 ` Jani Nikula @ 2015-03-18 8:41 ` Daniel Vetter 2015-03-18 11:36 ` Joonas Lahtinen 0 siblings, 1 reply; 4+ messages in thread From: Daniel Vetter @ 2015-03-18 8:41 UTC (permalink / raw) To: Jani Nikula Cc: Dan Carpenter, Daniel Vetter, Joonas Lahtinen, David Airlie, intel-gfx, kernel-janitors, dri-devel On Wed, Mar 18, 2015 at 10:36:45AM +0200, Jani Nikula wrote: > On Wed, 18 Mar 2015, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > In the original code then if WARN_ON(i915_is_ggtt(vm) != !!ggtt_view) > > was true then we leak "vma". Presumably that doesn't happen often but > > static checkers complain and this bug is easy to fix. > > > > Fixes: c3bbb6f2825d ('drm/i915: Do not use ggtt_view with (aliasing) PPGTT') > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Queued for -next, thanks for the patch. -Daniel > > > > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > > index f1b9ea6..cbf013f 100644 > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > > @@ -2340,12 +2340,13 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj, > > struct i915_address_space *vm, > > const struct i915_ggtt_view *ggtt_view) > > { > > - struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL); > > - if (vma = NULL) > > - return ERR_PTR(-ENOMEM); > > + struct i915_vma *vma; > > > > if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)) > > return ERR_PTR(-EINVAL); > > + vma = kzalloc(sizeof(*vma), GFP_KERNEL); > > + if (vma = NULL) > > + return ERR_PTR(-ENOMEM); > > > > INIT_LIST_HEAD(&vma->vma_link); > > INIT_LIST_HEAD(&vma->mm_list); > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [patch] drm/i915: memory leak in __i915_gem_vma_create() 2015-03-18 8:41 ` [Intel-gfx] " Daniel Vetter @ 2015-03-18 11:36 ` Joonas Lahtinen 0 siblings, 0 replies; 4+ messages in thread From: Joonas Lahtinen @ 2015-03-18 11:36 UTC (permalink / raw) To: Daniel Vetter Cc: Jani Nikula, Dan Carpenter, Daniel Vetter, David Airlie, intel-gfx, kernel-janitors, dri-devel On ke, 2015-03-18 at 09:41 +0100, Daniel Vetter wrote: > On Wed, Mar 18, 2015 at 10:36:45AM +0200, Jani Nikula wrote: > > On Wed, 18 Mar 2015, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > > In the original code then if WARN_ON(i915_is_ggtt(vm) != !!ggtt_view) > > > was true then we leak "vma". Presumably that doesn't happen often but > > > static checkers complain and this bug is easy to fix. > > > Correct, it was originally BUG_ON and then relaxed down to a warning in last series, so it slipped through. So it should practically be impossible to happen, but suits well to make static checker happier. Regards, Joonas > > > Fixes: c3bbb6f2825d ('drm/i915: Do not use ggtt_view with (aliasing) PPGTT') > > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Queued for -next, thanks for the patch. > -Daniel > > > > > > > > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > > > index f1b9ea6..cbf013f 100644 > > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > > > @@ -2340,12 +2340,13 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj, > > > struct i915_address_space *vm, > > > const struct i915_ggtt_view *ggtt_view) > > > { > > > - struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL); > > > - if (vma = NULL) > > > - return ERR_PTR(-ENOMEM); > > > + struct i915_vma *vma; > > > > > > if (WARN_ON(i915_is_ggtt(vm) != !!ggtt_view)) > > > return ERR_PTR(-EINVAL); > > > + vma = kzalloc(sizeof(*vma), GFP_KERNEL); > > > + if (vma = NULL) > > > + return ERR_PTR(-ENOMEM); > > > > > > INIT_LIST_HEAD(&vma->vma_link); > > > INIT_LIST_HEAD(&vma->mm_list); > > > > -- > > Jani Nikula, Intel Open Source Technology Center > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-18 11:36 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-03-18 8:21 [patch] drm/i915: memory leak in __i915_gem_vma_create() Dan Carpenter 2015-03-18 8:36 ` Jani Nikula 2015-03-18 8:41 ` [Intel-gfx] " Daniel Vetter 2015-03-18 11:36 ` Joonas Lahtinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).