| commit | d1a3a036637aac0e473f602347f879afcf91236c | [log] [tgz] |
|---|---|---|
| author | Matthew Auld <matthew.auld@intel.com> | Tue Aug 23 16:00:44 2016 +0100 |
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | Wed Aug 24 16:07:03 2016 +0300 |
| tree | 71c9ccc08dfc7e268a210ae77ce95825d7c3a205 | |
| parent | 8f76aa0ebe0b7787afe768d9df80031e832d2520 [diff] |
drm/i915: free intel_fb We need to free the allocated intel_fb in the error path, not intel_fb->base. Otherwise we risk calling kfree with a non-kmalloc'd address, which is bound to give us grief at some point. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1471964444-24460-1-git-send-email-matthew.auld@intel.com
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6684099..fc95373 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9777,7 +9777,7 @@ return; error: - kfree(fb); + kfree(intel_fb); } static void ironlake_get_pfit_config(struct intel_crtc *crtc,