From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: Re: [PATCH] intel: Don't leak the test page in an
 has_userptr() error path
Date: Fri, 19 Sep 2014 14:31:56 +0100
Message-ID: <541C304C.8030802@linux.intel.com>
References: <1410957471-11375-1-git-send-email-damien.lespiau@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <1410957471-11375-1-git-send-email-damien.lespiau@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Damien Lespiau <damien.lespiau@intel.com>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org


Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

On 09/17/2014 01:37 PM, Damien Lespiau wrote:
> When handling the error on GEM_CLOSE, we weren't freeing the allocated
> page. Plug that.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>   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 f378e5c..ce35bd4 100644
> --- a/intel/intel_bufmgr_gem.c
> +++ b/intel/intel_bufmgr_gem.c
> @@ -3383,9 +3383,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;
>