From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752488AbdK3MPF (ORCPT <rfc822;w@1wt.eu>);
        Thu, 30 Nov 2017 07:15:05 -0500
Received: from mail-pl0-f68.google.com ([209.85.160.68]:33651 "EHLO
        mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752418AbdK3MPB (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 30 Nov 2017 07:15:01 -0500
X-Google-Smtp-Source: AGs4zMbW0qpbmMAD8zOFuiCiDkbkAtyZZ408Km3wgDb4M+WZvIeeEHFo1cOCAYQRVUbxVEkzydZZsw==
Subject: Re: [PATCH] of: overlay: fix memory leak of ovcs on error exit path
To: Colin King <colin.king@canonical.com>,
        Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
        Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20171129191750.25254-1-colin.king@canonical.com>
From: Frank Rowand <frowand.list@gmail.com>
Message-ID: <dcb4e2a4-707b-0ccc-e12b-c6fa4ef251b7@gmail.com>
Date: Thu, 30 Nov 2017 07:14:45 -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: <20171129191750.25254-1-colin.king@canonical.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 11/29/17 14:17, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently if the call to of_resolve_phandles fails then then ovcs
> is not kfree'd on the error exit path.  Rather than try and make
> the clean up exit path more convoluted, fix this by just kfree'ing
> ovcs at the point of error detection and exit via the same exit
> path.
> 
> Detected by CoverityScan, CID#1462296 ("Resource Leak")
> 
> Fixes: f948d6d8b792 ("of: overlay: avoid race condition between applying multiple overlays")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/of/overlay.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
> index 53bc9e3f0b98..6c8efe7d8cbb 100644
> --- a/drivers/of/overlay.c
> +++ b/drivers/of/overlay.c
> @@ -708,8 +708,10 @@ int of_overlay_apply(struct device_node *tree, int *ovcs_id)
>  	of_overlay_mutex_lock();
>  
>  	ret = of_resolve_phandles(tree);
> -	if (ret)
> +	if (ret) {
> +		kfree(ovcs);
>  		goto err_overlay_unlock;
> +	}
>  
>  	mutex_lock(&of_mutex);
>  
> 

False coverity warning.  ovcs is freed in free_overlay_changeset().