diff options
| author | Eric Anholt <eric@anholt.net> | 2011-11-01 02:16:21 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-01 12:15:17 -0400 |
| commit | ff56b0bc84c01fb2c5d2ec6438becfe0f5f2f78f (patch) | |
| tree | f6f6d8cb510dc2204714cac1e6727c6a0226b35e /drivers | |
| parent | 627f7675f0f530ea555d76543dc4e469d70a1532 (diff) | |
drm/i915: Fix object refcount leak on mmappable size limit error path.
I've been seeing memory leaks on my system in the form of large
(300-400MB) GEM objects created by now-dead processes laying around
clogging up memory. I usually notice when it gets to about 1.2GB of
them. Hopefully this clears up the issue, but I just found this bug
by inspection.
Signed-off-by: Eric Anholt <eric@anholt.net>
Cc: stable@kernel.org
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6651c36b6e8a..d18b07adcffa 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1396,7 +1396,7 @@ i915_gem_mmap_gtt(struct drm_file *file, | |||
| 1396 | 1396 | ||
| 1397 | if (obj->base.size > dev_priv->mm.gtt_mappable_end) { | 1397 | if (obj->base.size > dev_priv->mm.gtt_mappable_end) { |
| 1398 | ret = -E2BIG; | 1398 | ret = -E2BIG; |
| 1399 | goto unlock; | 1399 | goto out; |
| 1400 | } | 1400 | } |
| 1401 | 1401 | ||
| 1402 | if (obj->madv != I915_MADV_WILLNEED) { | 1402 | if (obj->madv != I915_MADV_WILLNEED) { |