summaryrefslogtreecommitdiff
path: root/intel
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2014-09-17 13:33:45 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2014-09-19 14:36:35 +0100
commit77dce9a012c2bb9d152fe32458f17d3d5fc715a7 (patch)
tree33566ee3df11dc262a5a0da9a7d1290bd648f783 /intel
parent0fa1dbf6469dfd7b8cac4d924235b149ee83daf1 (diff)
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>
Diffstat (limited to 'intel')
-rw-r--r--intel/intel_bufmgr_gem.c5
1 files changed, 2 insertions, 3 deletions
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;