diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-11-08 01:41:23 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-02 19:10:08 +0000 |
| commit | 1646605d0abfcaa72380f8a2e2d13a7769380a19 (patch) | |
| tree | 68ed45719d31acffb54fd7d1659c530199081dd4 | |
| parent | f703dc9dabb5a236da94e2fa34ad2adcbd158ea0 (diff) | |
drm/i915: avoid deadlock on failure paths in __intel_framebuffer_create()
commit 6ccb81f2171ab48592946efab0ce0fd41978f4ba upstream.
Since a8bb6818270c __intel_framebuffer_create() is called
with struct_mutex held, so it should use drm_gem_object_unreference()
instead of drm_gem_object_unreference_unlocked().
Found by Linux Driver Verification project (linuxtesting.org).
This regression has been introduced in
commit a8bb6818270c32126dba0fd2ddb139d885c5687d
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon Feb 10 18:00:39 2014 +0100
drm/i915: Fix error path leak in fbdev fb allocation
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b019c563a787..0d68c70368ff 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8220,7 +8220,7 @@ __intel_framebuffer_create(struct drm_device *dev, intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL); if (!intel_fb) { - drm_gem_object_unreference_unlocked(&obj->base); + drm_gem_object_unreference(&obj->base); return ERR_PTR(-ENOMEM); } @@ -8230,7 +8230,7 @@ __intel_framebuffer_create(struct drm_device *dev, return &intel_fb->base; err: - drm_gem_object_unreference_unlocked(&obj->base); + drm_gem_object_unreference(&obj->base); kfree(intel_fb); return ERR_PTR(ret); |