From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BDDEC77B6C for ; Thu, 13 Apr 2023 07:15:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8523310EA3B; Thu, 13 Apr 2023 07:15:17 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA45D10EA3B; Thu, 13 Apr 2023 07:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681370116; x=1712906116; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=jypqQHoHc1mLtlBqinklOeRtPPtMmrLDMLbma0WWA0Q=; b=a8Rn7/EjHo+jKcNs5F5UyspD3qKi24o4+RpzlR6ZRqYNAJrI5tvDa8Vs bLsqAcLZmxgoH/a8gLag8RMOQvtgmyvy5AVKI3dItgn8fM9mQ18PfKkdm Syqr74jNgRDIJWCGcxQwOT8IEF9lSAbgIGZ97YY+Oo+jkG9oDkzwfu3BD wyiOL6tpcUfnW1ixHlzBIT9dXESf/e1y6S2MJJ/NdI02EDKBdRc38ZGn0 7mx1X03Caf8HHr/mIIgqy14pRQx6pyNLz20jbhLR6LpidgEKGFUzJK9P0 YOhwauW93qHDcf3GtIkBoHZjh3wJv+/vjNLLKp4vmUcRIJJBwxQb8aEUZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332813206" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332813206" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:15:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="666698005" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="666698005" Received: from svadali-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.55.23]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:15:09 -0700 From: Jani Nikula To: Andrzej Hajda , Cong Liu , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matthew Auld , Andi Shyti , Nirmoy Das , Matthew Brost , Jonathan Cavitt , Chris Wilson , Gwan-gyeong Mun , Mauro Carvalho Chehab , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org In-Reply-To: <71ba4962-14fd-887f-1d40-31089dd1cf50@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230413031349.9026-1-liucong2@kylinos.cn> <71ba4962-14fd-887f-1d40-31089dd1cf50@intel.com> Date: Thu, 13 Apr 2023 10:15:07 +0300 Message-ID: <874jpkckxw.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix memory leaks in i915 selftests X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 13 Apr 2023, Andrzej Hajda wrote: > On 13.04.2023 05:13, Cong Liu wrote: A commit message is still needed. >> Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") >> No blank line here. BR, Jani. >> Signed-off-by: Cong Liu >> --- > > Reviewed-by: Andrzej Hajda > > Regards > Andrzej >> 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); > -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E065BC77B61 for ; Thu, 13 Apr 2023 07:15:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B867D10EA40; Thu, 13 Apr 2023 07:15:17 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA45D10EA3B; Thu, 13 Apr 2023 07:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681370116; x=1712906116; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=jypqQHoHc1mLtlBqinklOeRtPPtMmrLDMLbma0WWA0Q=; b=a8Rn7/EjHo+jKcNs5F5UyspD3qKi24o4+RpzlR6ZRqYNAJrI5tvDa8Vs bLsqAcLZmxgoH/a8gLag8RMOQvtgmyvy5AVKI3dItgn8fM9mQ18PfKkdm Syqr74jNgRDIJWCGcxQwOT8IEF9lSAbgIGZ97YY+Oo+jkG9oDkzwfu3BD wyiOL6tpcUfnW1ixHlzBIT9dXESf/e1y6S2MJJ/NdI02EDKBdRc38ZGn0 7mx1X03Caf8HHr/mIIgqy14pRQx6pyNLz20jbhLR6LpidgEKGFUzJK9P0 YOhwauW93qHDcf3GtIkBoHZjh3wJv+/vjNLLKp4vmUcRIJJBwxQb8aEUZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="332813206" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="332813206" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:15:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10678"; a="666698005" X-IronPort-AV: E=Sophos;i="5.98,339,1673942400"; d="scan'208";a="666698005" Received: from svadali-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.55.23]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2023 00:15:09 -0700 From: Jani Nikula To: Andrzej Hajda , Cong Liu , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matthew Auld , Andi Shyti , Nirmoy Das , Matthew Brost , Jonathan Cavitt , Chris Wilson , Gwan-gyeong Mun , Mauro Carvalho Chehab , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/i915: Fix memory leaks in i915 selftests In-Reply-To: <71ba4962-14fd-887f-1d40-31089dd1cf50@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230413031349.9026-1-liucong2@kylinos.cn> <71ba4962-14fd-887f-1d40-31089dd1cf50@intel.com> Date: Thu, 13 Apr 2023 10:15:07 +0300 Message-ID: <874jpkckxw.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, 13 Apr 2023, Andrzej Hajda wrote: > On 13.04.2023 05:13, Cong Liu wrote: A commit message is still needed. >> Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") >> No blank line here. BR, Jani. >> Signed-off-by: Cong Liu >> --- > > Reviewed-by: Andrzej Hajda > > Regards > Andrzej >> 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); > -- Jani Nikula, Intel Open Source Graphics Center