summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorChris Wilson2009-02-08 20:08:04 +0100
committerDave Airlie2009-02-20 03:21:09 +0100
commit96dec61d563fb8dff2c8427fdf85327a95b65c74 (patch)
treeb514a1367cfa36cc18dd38a4251aae633772cd1a /drivers/gpu/drm/i915/i915_gem.c
parentdrm/i915: hold mutex for unreference() in i915_gem_tiling.c (diff)
downloadkernel-qcow2-linux-96dec61d563fb8dff2c8427fdf85327a95b65c74.tar.gz
kernel-qcow2-linux-96dec61d563fb8dff2c8427fdf85327a95b65c74.tar.xz
kernel-qcow2-linux-96dec61d563fb8dff2c8427fdf85327a95b65c74.zip
drm/i915: refleak along pin() error path.
A missing unreference if the user calls pin() a second time on a pinned buffer. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b79ced8f3c61..55f4c060fa01 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2755,6 +2755,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
if (obj_priv->pin_filp != NULL && obj_priv->pin_filp != file_priv) {
DRM_ERROR("Already pinned in i915_gem_pin_ioctl(): %d\n",
args->handle);
+ drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return -EINVAL;
}