drm/i915: free intel_fb
authorMatthew Auld <matthew.auld@intel.com>
Tue, 23 Aug 2016 15:00:44 +0000 (16:00 +0100)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 24 Aug 2016 13:07:03 +0000 (16:07 +0300)
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
drivers/gpu/drm/i915/intel_display.c

index 6684099d49c62b56ddbc24e74eb91f744d7bb041..fc953739af6982e65dbffeb576730d76c6ceaf28 100644 (file)
@@ -9777,7 +9777,7 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
        return;
 
 error:
-       kfree(fb);
+       kfree(intel_fb);
 }
 
 static void ironlake_get_pfit_config(struct intel_crtc *crtc,