Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1820368ybn; Thu, 26 Sep 2019 02:43:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPzOaz1jT44UcSgfp2Rf+ASJssYl+DOA4exmxbXr38kXkhn8CeBmlDzDsgkMTg2ektpkJx X-Received: by 2002:aa7:d718:: with SMTP id t24mr2465120edq.300.1569491013859; Thu, 26 Sep 2019 02:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569491013; cv=none; d=google.com; s=arc-20160816; b=mRH6jgH9SN4iYiLbMQ2bePDnfKF6UIytbOhHvDNn3Euedyw82HeLn5TbHyh16pvCaI TaU7qXVYtAZcRMEfuK1W7SUeUsuwhqbcQWbpEaU3W5MtiUUQSnp86NzcBZxmKUfOSd/R Gnas8WM2G8ZW2w5pmZbMDfh24JFZpGwcjfokSUg87XJFn8aVhvptsLilfoH/uGn+oili I1adA8ISQMf51BY+cBFORjYz8kv1BQsw5UQM0XjnEawFt/Mv2bmzGXC9eAHZTBnVrX2x pYkplsYiWC60LlkfdEFPYwUESZGfWH45AtrHeJJZnP/RySddd+9u45igWvZ7Ge/ezP2U w9xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=rVfl8kpdiHnS1ptDn6UBfU0R6eJj6Us2UCfGbdbQiks=; b=CeCfnQSUR7O4tYcSKdqAc+e6IW/9DbiY35K/oyHQ/3IknEwmIt4MNP2PlN43L9pNSL eq2EHF07ZUHSfURsV2OG08smHu/Ozed4B/+CBrQEgw816tHT/QnR+hKaDYaRGbfvEP3Y 4QGa/G3v81/8Ox1Ir0VwwD4cBplAELfzvnUFMbWY3NsJM8k1vR3wCtZXzEeHmjOYyc7a MCJbf889Cm3quWeqt74aktxHkM7JZkc7daMnwijSSI9HL0YzghdbrizaWn/+jotWt6em 1fRtPapQ8tEZyyzek4fgn7OgB/SB8qmBiCioJis6V8fFVek18POHYkr4MsmYytDfYIqX 1uhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=UQJFF7Qq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gh16si720899ejb.150.2019.09.26.02.43.10; Thu, 26 Sep 2019 02:43:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=UQJFF7Qq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439787AbfIYQEj (ORCPT + 99 others); Wed, 25 Sep 2019 12:04:39 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39947 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725851AbfIYQEi (ORCPT ); Wed, 25 Sep 2019 12:04:38 -0400 Received: by mail-wr1-f65.google.com with SMTP id l3so7599501wru.7 for ; Wed, 25 Sep 2019 09:04:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rVfl8kpdiHnS1ptDn6UBfU0R6eJj6Us2UCfGbdbQiks=; b=UQJFF7QqglouBiozK+rZQFhqy9yX0DjGq6rCnCScMxjiVsTq0nqE5PeGmHCPjsYpYE oxtfpMe9CLFZyNx3fklf93kj6EgLCZUzTbh0n2k+yar3ZvH5VcDwRiit2P1ud3JfBLzE rffar6gaIm3OY3/eqIhqHzxgx33QSuBDhBtJCGv44wMVYgK1PVfTEkEEH9sf6hNSNUt3 5W76iJvw8YnLOgofTAM1fXAMJXWJ1mEBITmBIKC2H2GYY+71CpKBTYAAFLfrUEl+Kmz0 pl5aEOoTXCjoPQXQYAUBl7eKXPvykchZ72C/2XAL5ziV/s3ThIiEnZRNjkcKw+MfAKmK Z6bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rVfl8kpdiHnS1ptDn6UBfU0R6eJj6Us2UCfGbdbQiks=; b=FxhF8VQqfxFX4fVX1A5MQaQNiZ0PU1rZmQ25ujifcdyYRyJIE4q/46GkrDXfwwmzOV hgTtmGIIenKgm3pPfDH9IjrtroUIrN1dJqAKVzOSkCon/2o3Jz/XP4uVSzQcsjxOKhkg Y/zwXcd6WUjW8K6FUGFj9AQRccePgwOVmGUvYsa+Fe8JGF8dMzaHkQnlEzaqZFhmYFFL u4rxgrtjuRjBOkTLPhkQLo57V5TV1k5VvT60NuqjemdIQJ9MYDc7s/23PABxgC5k4ixP BvaBparig5RbhmAfVrDkryHc5Clwx8GmW6udwwBoiwmzwxDpU1s0tN3kmW06GWjN4LwL vjrw== X-Gm-Message-State: APjAAAUWv/ZB4qm19aym1vECJI9Hh7lUSbWPz8QNN06lbngnSoTAw4El 7/d3HtR7AysjGYqLb2958Yz0L75nDiP/JlREOBTBLw== X-Received: by 2002:a5d:4444:: with SMTP id x4mr9892045wrr.11.1569427475640; Wed, 25 Sep 2019 09:04:35 -0700 (PDT) MIME-Version: 1.0 References: <20190925042407.31383-1-navid.emamdoost@gmail.com> <5cb6dec0-7f88-5d14-82cb-919f1d190b2f@amd.com> In-Reply-To: <5cb6dec0-7f88-5d14-82cb-919f1d190b2f@amd.com> From: Alex Deucher Date: Wed, 25 Sep 2019 12:04:22 -0400 Message-ID: Subject: Re: [PATCH] drm/amd/display: prevent memory leak To: Harry Wentland Cc: Navid Emamdoost , David Airlie , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "Lei, Jun" , Sam Ravnborg , Wang Hai , "Cheng, Tony" , "Francis, David" , "amd-gfx@lists.freedesktop.org" , "emamd001@umn.edu" , "Bernstein, Eric" , Su Sung Chung , "smccaman@umn.edu" , "Li, Sun peng (Leo)" , "kjlu@umn.edu" , Aidan Wood , "Wu, Hersen" , "Lakha, Bhawanpreet" , "Chalmers, Kenneth" , Thomas Lim , "Yang, Eric" , "Chalmers, Wesley" , "Li, Roman" , "Koenig, Christian" , "Laktyushkin, Dmytro" , "Deucher, Alexander" , "Kazlauskas, Nicholas" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 25, 2019 at 9:54 AM Harry Wentland wrote: > > > > On 2019-09-25 12:23 a.m., Navid Emamdoost wrote: > > In dcn*_create_resource_pool the allocated memory should be released if > > construct pool fails. > > > > Signed-off-by: Navid Emamdoost > > Reviewed-by: Harry Wentland > Applied. thanks! Alex > Harry > > > --- > > drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 + > > drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 + > > drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 + > > drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 + > > drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + > > 5 files changed, 5 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > index afc61055eca1..1787b9bf800a 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > @@ -1091,6 +1091,7 @@ struct resource_pool *dce100_create_resource_pool( > > if (construct(num_virtual_links, dc, pool)) > > return &pool->base; > > > > + kfree(pool); > > BREAK_TO_DEBUGGER(); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > index c66fe170e1e8..318e9c2e2ca8 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > @@ -1462,6 +1462,7 @@ struct resource_pool *dce110_create_resource_pool( > > if (construct(num_virtual_links, dc, pool, asic_id)) > > return &pool->base; > > > > + kfree(pool); > > BREAK_TO_DEBUGGER(); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > index 3ac4c7e73050..3199d493d13b 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > @@ -1338,6 +1338,7 @@ struct resource_pool *dce112_create_resource_pool( > > if (construct(num_virtual_links, dc, pool)) > > return &pool->base; > > > > + kfree(pool); > > BREAK_TO_DEBUGGER(); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > index 7d08154e9662..bb497f43f6eb 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > @@ -1203,6 +1203,7 @@ struct resource_pool *dce120_create_resource_pool( > > if (construct(num_virtual_links, dc, pool)) > > return &pool->base; > > > > + kfree(pool); > > BREAK_TO_DEBUGGER(); > > return NULL; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > index 5a89e462e7cc..59305e411a66 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > @@ -1570,6 +1570,7 @@ struct resource_pool *dcn10_create_resource_pool( > > if (construct(init_data->num_virtual_links, dc, pool)) > > return &pool->base; > > > > + kfree(pool); > > BREAK_TO_DEBUGGER(); > > return NULL; > > } > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel