From: Alison Schofield <alison.schofield@intel.com>
To: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Cc: vishal.l.verma@intel.com, nvdimm@lists.linux.dev,
linfeilong@huawei.com, lixiaokeng <lixiaokeng@huawei.com>
Subject: Re: [ndctl PATCH 2/2] namespace: fix potentail fd leak problem in do_xaction_namespace()
Date: Wed, 30 Jun 2021 10:47:24 -0700 [thread overview]
Message-ID: <20210630174724.GB25123@alison-desk.jf.intel.com> (raw)
In-Reply-To: <7a84b450-ac3e-caa9-f280-1b6163466316@huawei.com>
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
> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
> ---
> 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
>
>
>
>
> .
>
>
>
next prev parent reply other threads:[~2021-06-30 17:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 12:37 [ndctl PATCH 0/2] fix two issues reported by Coverity Zhiqiang Liu
2021-06-15 12:38 ` [ndctl PATCH 1/2] libndctl: check return value of ndctl_pfn_get_namespace Zhiqiang Liu
2021-06-30 17:41 ` Alison Schofield
2021-07-01 3:23 ` Zhiqiang Liu
2021-07-06 4:35 ` Zhiqiang Liu
2021-06-15 12:39 ` [ndctl PATCH 2/2] namespace: fix potentail fd leak problem in do_xaction_namespace() Zhiqiang Liu
2021-06-30 17:47 ` Alison Schofield [this message]
2021-07-01 1:42 ` Zhiqiang Liu
2021-06-30 2:55 ` [ndctl PATCH 0/2] fix two issues reported by Coverity Zhiqiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210630174724.GB25123@alison-desk.jf.intel.com \
--to=alison.schofield@intel.com \
--cc=linfeilong@huawei.com \
--cc=liuzhiqiang26@huawei.com \
--cc=lixiaokeng@huawei.com \
--cc=nvdimm@lists.linux.dev \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).