From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752742AbdK3MyV (ORCPT ); Thu, 30 Nov 2017 07:54:21 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:42478 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783AbdK3MyU (ORCPT ); Thu, 30 Nov 2017 07:54:20 -0500 Subject: Re: [PATCH] of: overlay: fix memory leak of ovcs on error exit path To: Dan Carpenter , Frank Rowand , Geert Uytterhoeven Cc: Pantelis Antoniou , Rob Herring , devicetree@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20171129191750.25254-1-colin.king@canonical.com> <20171130125002.wlnnev5pjih6d5bz@mwanda> From: Colin Ian King Message-ID: <06ef1a5a-5321-75ad-9610-e7f3692f48df@canonical.com> Date: Thu, 30 Nov 2017 12:54:17 +0000 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: <20171130125002.wlnnev5pjih6d5bz@mwanda> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30/11/17 12:50, Dan Carpenter wrote: > On Thu, Nov 30, 2017 at 07:14:45AM -0500, Frank Rowand wrote: >> On 11/29/17 14:17, Colin King wrote: >>> From: Colin Ian King >>> >>> 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") > > The Fixes tag is wrong. It should be: > > Fixes: bd80e2555c5c ("of: overlay: Fix cleanup order in of_overlay_apply()") Good catch. I'll send a V2. Colin > >>> Signed-off-by: Colin Ian King >>> --- >>> 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(). > > You're looking at an older version of the code and Colin is looking at > linux-next. > > regards, > dan carpenter >