diff options
| author | Lukas Wunner | 2015-10-22 13:37:18 +0200 |
|---|---|---|
| committer | Jani Nikula | 2015-11-09 15:03:00 +0100 |
| commit | ca40ba855c9e3f19f2715fd8a1ced5128359d3d9 (patch) | |
| tree | aea8c3a3af15c166de9af37c6c85909933fb95a5 /drivers/gpu/drm/i915/intel_fbdev.c | |
| parent | drm/i915: On fb alloc failure, unref gem object where it gets refed (diff) | |
| download | kernel-qcow2-linux-ca40ba855c9e3f19f2715fd8a1ced5128359d3d9.tar.gz kernel-qcow2-linux-ca40ba855c9e3f19f2715fd8a1ced5128359d3d9.tar.xz kernel-qcow2-linux-ca40ba855c9e3f19f2715fd8a1ced5128359d3d9.zip | |
drm/i915: Fix double unref in intelfb_alloc failure path
In intelfb_alloc(), if the call to intel_pin_and_fence_fb_obj() fails,
the bo is unrefed twice: By drm_framebuffer_remove() and once more by
drm_gem_object_unreference(). Fix it.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/cd7b33330621a350b0159ec5e098297b139cfaf7.1446892879.git.lukas@wunner.de
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 840d6bf5e8d5..2240e709ede6 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -156,8 +156,9 @@ static int intelfb_alloc(struct drm_fb_helper *helper, fb = __intel_framebuffer_create(dev, &mode_cmd, obj); if (IS_ERR(fb)) { + drm_gem_object_unreference(&obj->base); ret = PTR_ERR(fb); - goto out_unref; + goto out; } /* Flush everything out, we'll be doing GTT only from now on */ @@ -173,8 +174,6 @@ static int intelfb_alloc(struct drm_fb_helper *helper, out_fb: drm_framebuffer_remove(fb); -out_unref: - drm_gem_object_unreference(&obj->base); out: return ret; } |