Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 13 Apr 2023 10:44:50 +0200
From:   Andi Shyti <andi.shyti@linux.intel.com>
To:     Cong Liu <liucong2@kylinos.cn>
Cc:     jani.nikula@linux.intel.com, airlied@gmail.com,
        andi.shyti@linux.intel.com, andrzej.hajda@intel.com,
        chris@chris-wilson.co.uk, daniel@ffwll.ch,
        dri-devel@lists.freedesktop.org, gwan-gyeong.mun@intel.com,
        intel-gfx@lists.freedesktop.org, jonathan.cavitt@intel.com,
        joonas.lahtinen@linux.intel.com, linux-kernel@vger.kernel.org,
        matthew.auld@intel.com, matthew.brost@intel.com,
        mchehab@kernel.org, nirmoy.das@intel.com, rodrigo.vivi@intel.com,
        tvrtko.ursulin@linux.intel.com
Subject: Re: [PATCH] drm/i915: Fix memory leaks in i915 selftests
Message-ID: <ZDfBAs/RKfAljk4o@ashyti-mobl2.lan>
References: <874jpkckxw.fsf@intel.com>
 <20230413075526.221068-1-liucong2@kylinos.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230413075526.221068-1-liucong2@kylinos.cn>
Precedence: bulk

On Thu, Apr 13, 2023 at 03:55:26PM +0800, Cong Liu wrote:
> This patch fixes memory leaks on error escapes in function fake_get_pages
> 
> Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation")
> Signed-off-by: Cong Liu <liucong2@kylinos.cn>

OK, while I was proposing the adjustments suggested by Jani you
already replied to the e-mail. I will keep your version.

Anyway, next time, please, do not forget to add the r-b's, in
this case it was Andrzej's.

Andi

> ---
>  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> index 5361ce70d3f2..154801f1c468 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> @@ -69,8 +69,10 @@ static int fake_get_pages(struct drm_i915_gem_object *obj)
>  
>  	rem = round_up(obj->base.size, BIT(31)) >> 31;
>  	/* restricted by sg_alloc_table */
> -	if (overflows_type(rem, unsigned int))
> +	if (overflows_type(rem, unsigned int)) {
> +		kfree(pages);
>  		return -E2BIG;
> +	}
>  
>  	if (sg_alloc_table(pages, rem, GFP)) {
>  		kfree(pages);
> -- 
> 2.34.1
> 
> 
> No virus found
> 		Checked by Hillstone Network AntiVirus