From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E975E168 for ; Thu, 1 Jul 2021 01:59:16 +0000 (UTC) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GFgmf2FJXz1BTj2 for ; Thu, 1 Jul 2021 09:36:50 +0800 (CST) Received: from dggema765-chm.china.huawei.com (10.1.198.207) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Thu, 1 Jul 2021 09:42:09 +0800 Received: from [127.0.0.1] (10.174.177.249) by dggema765-chm.china.huawei.com (10.1.198.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Thu, 1 Jul 2021 09:42:09 +0800 Subject: Re: [ndctl PATCH 2/2] namespace: fix potentail fd leak problem in do_xaction_namespace() To: Alison Schofield CC: , , , lixiaokeng References: <7a84b450-ac3e-caa9-f280-1b6163466316@huawei.com> <20210630174724.GB25123@alison-desk.jf.intel.com> From: Zhiqiang Liu Message-ID: <1ba60e81-f7ac-0784-4375-6f2106fae94d@huawei.com> Date: Thu, 1 Jul 2021 09:42:07 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20210630174724.GB25123@alison-desk.jf.intel.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.177.249] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggema765-chm.china.huawei.com (10.1.198.207) X-CFilter-Loop: Reflected On 2021/7/1 1:47, Alison Schofield wrote: > On Tue, Jun 15, 2021 at 08:39:20PM +0800, Zhiqiang Liu wrote: >> In do_xaction_namespace(), ri_ctx.f_out should be closed after >> being opened. >> > Hi Zhiqiang, > > The commit message and commit log need to be swapped. > > Something like: > > Commit message says what the patch does: > [ndctl PATCH 2/2] namespace: Close fd before return in do_xaction_namespace() > > Commit log says why it needs to be done: > This prevents a potential file descriptor leak in do_xaction_namespace() > > And, same as in Patch 1 - mention it was found by Coverity. > > Alison Thanks for your advice. I will do that as your suggestion in v2 patch. > >> Signed-off-by: Zhiqiang Liu >> --- >> ndctl/namespace.c | 17 +++++++++-------- >> 1 file changed, 9 insertions(+), 8 deletions(-) >> >> diff --git a/ndctl/namespace.c b/ndctl/namespace.c >> index 21089d7..55364ac 100644 >> --- a/ndctl/namespace.c >> +++ b/ndctl/namespace.c >> @@ -2141,7 +2141,7 @@ static int do_xaction_namespace(const char *namespace, >> util_display_json_array(ri_ctx.f_out, ri_ctx.jblocks, 0); >> if (rc >= 0) >> (*processed)++; >> - return rc; >> + goto out; >> } >> } >> >> @@ -2152,11 +2152,11 @@ static int do_xaction_namespace(const char *namespace, >> rc = file_write_infoblock(param.outfile); >> if (rc >= 0) >> (*processed)++; >> - return rc; >> + goto out; >> } >> >> if (!namespace && action != ACTION_CREATE) >> - return rc; >> + goto out; >> >> if (verbose) >> ndctl_set_log_priority(ctx, LOG_DEBUG); >> @@ -2212,7 +2212,7 @@ static int do_xaction_namespace(const char *namespace, >> saved_rc = rc; >> continue; >> } >> - return rc; >> + goto out; >> } >> ndctl_namespace_foreach_safe(region, ndns, _n) { >> ndns_name = ndctl_namespace_get_devname(ndns); >> @@ -2259,7 +2259,7 @@ static int do_xaction_namespace(const char *namespace, >> rc = namespace_reconfig(region, ndns); >> if (rc == 0) >> *processed = 1; >> - return rc; >> + goto out; >> case ACTION_READ_INFOBLOCK: >> rc = namespace_rw_infoblock(ndns, &ri_ctx, READ); >> if (rc == 0) >> @@ -2281,9 +2281,6 @@ static int do_xaction_namespace(const char *namespace, >> if (ri_ctx.jblocks) >> util_display_json_array(ri_ctx.f_out, ri_ctx.jblocks, 0); >> >> - if (ri_ctx.f_out && ri_ctx.f_out != stdout) >> - fclose(ri_ctx.f_out); >> - >> if (action == ACTION_CREATE && rc == -EAGAIN) { >> /* >> * Namespace creation searched through all candidate >> @@ -2301,6 +2298,10 @@ static int do_xaction_namespace(const char *namespace, >> if (saved_rc) >> rc = saved_rc; >> >> +out: >> + if (ri_ctx.f_out && ri_ctx.f_out != stdout) >> + fclose(ri_ctx.f_out); >> + >> return rc; >> } >> >> -- >> 2.23.0 >> >> >> >> >> . >> >> >> > .