> -----Original Message----- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jacek Piasecki > Sent: Thursday, October 26, 2017 8:21 AM > To: Dumitrescu, Cristian <cristian.dumitre...@intel.com> > Cc: dev@dpdk.org; Piasecki, JacekX <jacekx.piase...@intel.com>; > sta...@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.piase...@intel.com > Cc: sta...@dpdk.org > > Signed-off-by: Jacek Piasecki <jacekx.piase...@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.jastrzeb...@intel.com>
