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;
Subject: Re: [PATCH] drm/amd/display: fix memory leaks on error exit return
To:     Colin King <colin.king@canonical.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        David Airlie <airlied@linux.ie>,
        Tony Cheng <tony.cheng@amd.com>, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org
Cc:     kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20171122164735.1497-1-colin.king@canonical.com>
From:   Harry Wentland <harry.wentland@amd.com>
Message-ID: <7f0ece54-283a-aab6-da42-9102565e8e7e@amd.com>
Date:   Wed, 22 Nov 2017 12:13:35 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <20171122164735.1497-1-colin.king@canonical.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 17:13:39.8430 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 22dc1fa1-c8bc-4a85-db2c-08d531cc6136
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB2472
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2017-11-22 11:47 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently in the case where some of the allocations fail for dce110_tgv,
> dce110_xfmv, dce110_miv or dce110_oppv then the exit return path ends
> up leaking allocated objects. Fix this by kfree'ing them before returning.
> Also re-work the comparison of the null pointers to use the !ptr idiom.
> 
> Detected by CoverityScan, CID#1460246, 1460325, 1460324, 1460392
> ("Resource Leak")
> 
> Fixes: c4562236b3bc ("drm/amd/dc: Add dc display driver (v2)")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Thanks. I got the same patch but was too slow to post.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> 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 db96d2b47ff1..61adb8174ce0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> @@ -1037,11 +1037,13 @@ static bool underlay_create(struct dc_context *ctx, struct resource_pool *pool)
>  	struct dce110_opp *dce110_oppv = kzalloc(sizeof(*dce110_oppv),
>  						 GFP_KERNEL);
>  
> -	if ((dce110_tgv == NULL) ||
> -		(dce110_xfmv == NULL) ||
> -		(dce110_miv == NULL) ||
> -		(dce110_oppv == NULL))
> -			return false;
> +	if (!dce110_tgv || !dce110_xfmv || !dce110_miv || !dce110_oppv) {
> +		kfree(dce110_tgv);
> +		kfree(dce110_xfmv);
> +		kfree(dce110_miv);
> +		kfree(dce110_oppv);
> +		return false;
> +	}
>  
>  	dce110_opp_v_construct(dce110_oppv, ctx);
>  
> 

From 1584785590923131463@xxx Wed Nov 22 16:48:35 +0000 2017
X-GM-THRID: 1584785590923131463
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread