From 77dce9a012c2bb9d152fe32458f17d3d5fc715a7 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Wed, 17 Sep 2014 13:33:45 +0100 Subject: [PATCH] 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 Signed-off-by: Damien Lespiau --- intel/intel_bufmgr_gem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 35b42cf..ba65527 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; -- 2.7.4