From: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed, 17 Sep 2014 12:33:45 +0000 (+0100)
Subject: intel: Don't leak the test page in an has_userptr() error path
X-Git-Tag: android-x86-4.4-r2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=77dce9a012c2bb9d152fe32458f17d3d5fc715a7;p=android-x86%2Fexternal-libdrm.git

intel: Don't leak the test page in an has_userptr() error path

When handling the error on GEM_CLOSE, we weren't freeing the allocated
page. Plug that.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 35b42cf4..ba655274 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3403,9 +3403,8 @@ retry:
 
 	close_bo.handle = userptr.handle;
 	ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
-	if (ret == 0) {
-		free(ptr);
-	} else {
+	free(ptr);
+	if (ret) {
 		fprintf(stderr, "Failed to release test userptr object! (%d) "
 				"i915 kernel driver may not be sane!\n", errno);
 		return false;