From: "Jastrzebski, MichalX K" <michalx.k.jastrzebski@intel.com>
To: "Piasecki, JacekX" <jacekx.piasecki@intel.com>,
"Dumitrescu, Cristian" <cristian.dumitrescu@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"Piasecki, JacekX" <jacekx.piasecki@intel.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] cfgfile: fix resource leak
Date: Fri, 27 Oct 2017 15:08:19 +0000 [thread overview]
Message-ID: <60ABE07DBB3A454EB7FAD707B4BB158213C4B1B1@IRSMSX109.ger.corp.intel.com> (raw)
In-Reply-To: <1508998869-4963-1-git-send-email-jacekx.piasecki@intel.com>
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jacek Piasecki
> Sent: Thursday, October 26, 2017 8:21 AM
> To: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> Cc: dev@dpdk.org; Piasecki, JacekX <jacekx.piasecki@intel.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] cfgfile: fix resource leak
>
> Unsuccesfull memory allocation for elements inside cfgfile
> structure could result in resource leak.
> Fixed by pointer verification after each malloc,
> if malloc fail - error branch is proceeded with freeing memory.
>
> Coverity issue: 195032
> Fixes: d4cb8197589d ("cfgfile: support runtime modification")
> Cc: jacekx.piasecki@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Jacek Piasecki <jacekx.piasecki@intel.com>
> ---
> lib/librte_cfgfile/rte_cfgfile.c | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
> index 124aef5..2880b9a 100644
> --- a/lib/librte_cfgfile/rte_cfgfile.c
> +++ b/lib/librte_cfgfile/rte_cfgfile.c
> @@ -298,7 +298,7 @@ rte_cfgfile_create(int flags)
> CFG_ALLOC_SECTION_BATCH);
>
> if (cfg->sections == NULL)
> - return NULL;
> + goto error1;
>
> cfg->allocated_sections = CFG_ALLOC_SECTION_BATCH;
>
> @@ -307,7 +307,7 @@ rte_cfgfile_create(int flags)
> struct rte_cfgfile_entry) *
> CFG_ALLOC_ENTRY_BATCH);
>
> if (cfg->sections[i].entries == NULL)
> - return NULL;
> + goto error1;
>
> cfg->sections[i].num_entries = 0;
> cfg->sections[i].allocated_entries =
> CFG_ALLOC_ENTRY_BATCH;
> @@ -315,7 +315,21 @@ rte_cfgfile_create(int flags)
>
> if (flags & CFG_FLAG_GLOBAL_SECTION)
> rte_cfgfile_add_section(cfg, "GLOBAL");
> +
> return cfg;
> +error1:
> + if (cfg->sections != NULL) {
> + for (i = 0; i < cfg->allocated_sections; i++) {
> + if (cfg->sections[i].entries != NULL) {
> + free(cfg->sections[i].entries);
> + cfg->sections[i].entries = NULL;
> + }
> + }
> + free(cfg->sections);
> + cfg->sections = NULL;
> + }
> + free(cfg);
> + return NULL;
> }
>
> int
> --
> 2.7.4
Acked-by: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>
prev parent reply other threads:[~2017-10-27 15:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 6:21 [dpdk-stable] " Jacek Piasecki
2017-10-27 15:08 ` Jastrzebski, MichalX K [this message]
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=60ABE07DBB3A454EB7FAD707B4BB158213C4B1B1@IRSMSX109.ger.corp.intel.com \
--to=michalx.k.jastrzebski@intel.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
--cc=jacekx.piasecki@intel.com \
--cc=stable@dpdk.org \
/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).