diff options
| author | Eric Anholt <eric@anholt.net> | 2011-11-01 07:16:21 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-11-08 11:50:36 +0100 |
| commit | 14660ccd599dc7bd6ecef17408bd76dc853f9b77 (patch) | |
| tree | 98dde39f1a4110fd63b3690148c9294d8bf871d4 /drivers/gpu | |
| parent | agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set (diff) | |
| download | linux-14660ccd599dc7bd6ecef17408bd76dc853f9b77.tar.xz linux-14660ccd599dc7bd6ecef17408bd76dc853f9b77.zip | |
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/gpu')
| -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, if (obj->base.size > dev_priv->mm.gtt_mappable_end) { ret = -E2BIG; - goto unlock; + goto out; } if (obj->madv != I915_MADV_WILLNEED) { |