From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 9 Feb 2009 11:31:41 +0000 (+0000)
Subject: drm: Potential use-after-free on error path.
X-Git-Tag: v2.6.29-rc6~16^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad45aa9e6e010283bbd8cf0c6309866233e113f2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

drm: Potential use-after-free on error path.

Remove the member from the hash table before we free the structure!

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>
---

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 6915fb8..308fe1e 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -104,8 +104,8 @@ drm_gem_init(struct drm_device *dev)
 
 	if (drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START,
 			DRM_FILE_PAGE_OFFSET_SIZE)) {
-		drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
 		drm_ht_remove(&mm->offset_hash);
+		drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
 		return -ENOMEM;
 	}