From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752523AbdK3MSF (ORCPT ); Thu, 30 Nov 2017 07:18:05 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:41945 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032AbdK3MSE (ORCPT ); Thu, 30 Nov 2017 07:18:04 -0500 Subject: Re: [PATCH] of: overlay: fix memory leak of ovcs on error exit path To: Frank Rowand , Pantelis Antoniou , Rob Herring , devicetree@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20171129191750.25254-1-colin.king@canonical.com> From: Colin Ian King Message-ID: <806a0467-87c8-4100-c7f2-54cfa8732465@canonical.com> Date: Thu, 30 Nov 2017 12:18:02 +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: 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:14, 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") >> 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(). > The error exit path is via err_overlay_unlock: err_overlay_unlock: of_overlay_mutex_unlock(); out: pr_debug("%s() err=%d\n", __func__, ret); return ret; ..so there is no call to free_overlay_changeset there. Colin