Message ID | 20230413031349.9026-1-liucong2@kylinos.cn |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp757714vqo; Wed, 12 Apr 2023 20:29:36 -0700 (PDT) X-Google-Smtp-Source: AKy350ZzIhl4qRTYFIcRQXzhd6b1UK57qy0X+VrCBeG3Eqd1aaEKyow74x2pmmGU5aKg6sqem/gE X-Received: by 2002:a17:903:2350:b0:1a1:953b:9559 with SMTP id c16-20020a170903235000b001a1953b9559mr752226plh.3.1681356575860; Wed, 12 Apr 2023 20:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681356575; cv=none; d=google.com; s=arc-20160816; b=YCBL2unyges2MLXXiQwSNkcsxn0/pHKiG9rX4sLFBlKxNL8ukglxdZp3+IEvbFRo+k zPm2rL7gzVmWeAbow8eZR9ycaL+o0eV2kzdzjlbtWavXmdYMkkO9FP6aT5LcOlahP3zj 9xSOr1Z7aJ7gUftlz1LUOVDqko7whJc7cdbsFi7F5rTK5vNGlz4Udh9k3QVk4hvaTokU XAx6+6SLp+R7ZLyBOY9WWGsb4K3Ml2f2cjcGjeIJb8pjhTpb50h39A1gOaGAxiXUzwCI QaNrmBMOfB73qSa2FNoaanIwrpIPicP4wSvzuhYy9tqn7RA5ZChQCNVsw8aJY2jytNYF Nelw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=GfcCQUDVkXVYrHXBPz2lrOInNuloWlnckK68LFDJW9g=; b=t6viZ2+Z2RKOxKMpOzy9L5X4+QMDzqJqabOz40SBeOfEqVO3uYWqVzQjpTyo6CLARk U1/ZBnOkCsENcdjXBwVofrAC6Q/w+vKd4pj+NoUerkg4rO9VZi8pO/Z/bxm3yJTZ2eTx 3rbhI7R2+Tw+GEs0axUVnAEBeB2zP3swN7zWLOcl5/Djxi8PuvcFiqTteLPQw1ovVNif +lFo4osa1rom6CtBPk14pO3ILbKA35WumSKoaVWFpnpiV7yW1fQFPgSdwozFqXPsM3Ke FmtI6DW2QIiRjyA/BshSHZvAt63yT4/iKkJNIl7eRyjHwwlJliPGIyW9akJptbIJpbeH ve4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p17-20020a170902e75100b0019f34a15738si921036plf.139.2023.04.12.20.29.24; Wed, 12 Apr 2023 20:29:35 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229533AbjDMDOJ (ORCPT <rfc822;peter110.wang@gmail.com> + 99 others); Wed, 12 Apr 2023 23:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjDMDOH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 12 Apr 2023 23:14:07 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 475B24EDD for <linux-kernel@vger.kernel.org>; Wed, 12 Apr 2023 20:14:06 -0700 (PDT) X-UUID: 2af2d65a6c6840df86ab547bf360109b-20230413 X-CID-UNFAMILIAR: 1 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:c30541db-2ea1-4af6-9267-42766adcc549,IP:5,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:8,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:8 X-CID-INFO: VERSION:1.1.22,REQID:c30541db-2ea1-4af6-9267-42766adcc549,IP:5,URL :0,TC:0,Content:-5,EDM:0,RT:0,SF:8,FILE:0,BULK:0,RULE:Release_HamU,ACTION: release,TS:8 X-CID-META: VersionHash:120426c,CLOUDID:1255e483-cd9c-45f5-8134-710979e3df0e,B ulkID:230413111352DVZVW4B9,BulkQuantity:0,Recheck:0,SF:19|44|38|24|16|102, TC:nil,Content:0,EDM:-3,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 2af2d65a6c6840df86ab547bf360109b-20230413 X-User: liucong2@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from <liucong2@kylinos.cn>) (Generic MTA) with ESMTP id 30789537; Thu, 13 Apr 2023 11:13:51 +0800 From: Cong Liu <liucong2@kylinos.cn> To: Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Matthew Auld <matthew.auld@intel.com>, Andi Shyti <andi.shyti@linux.intel.com>, Nirmoy Das <nirmoy.das@intel.com>, Andrzej Hajda <andrzej.hajda@intel.com>, Matthew Brost <matthew.brost@intel.com>, Jonathan Cavitt <jonathan.cavitt@intel.com>, Chris Wilson <chris@chris-wilson.co.uk>, Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Cong Liu <liucong2@kylinos.cn> Subject: [PATCH] drm/i915: Fix memory leaks in i915 selftests Date: Thu, 13 Apr 2023 11:13:49 +0800 Message-Id: <20230413031349.9026-1-liucong2@kylinos.cn> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763030153184312158?= X-GMAIL-MSGID: =?utf-8?q?1763030153184312158?= |
Series |
drm/i915: Fix memory leaks in i915 selftests
|
|
Commit Message
Cong Liu
April 13, 2023, 3:13 a.m. UTC
Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation")
Signed-off-by: Cong Liu <liucong2@kylinos.cn>
---
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Comments
On 13.04.2023 05:13, Cong Liu wrote: > Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") > > Signed-off-by: Cong Liu <liucong2@kylinos.cn> > --- Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> 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);
On Thu, 13 Apr 2023, Andrzej Hajda <andrzej.hajda@intel.com> 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 <liucong2@kylinos.cn> >> --- > > Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> > > 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); >
Hi Cong, > Fixes: c3bfba9a2225 ("drm/i915: Check for integer truncation on scatterlist creation") > > Signed-off-by: Cong Liu <liucong2@kylinos.cn> As Jani suggested we need a commit message here. Would something like this work for you? " We forget to free 'pages' after checking for overflow. Be sure to properly free the allocated memory before exiting the fake_free_pages() function. " If it's OK for you, then I can add this message and fix the blank space before pushing this patch. In any case: Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> 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
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);