From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ira Weiny Subject: Re: [PATCH] opensm/osm_console.c: fix memory and file descriptor leaks Date: Tue, 7 Sep 2010 08:20:47 -0700 Message-ID: <20100907082047.3b6be681.weiny2@llnl.gov> References: <4C86567A.5060400@mellanox.co.il> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4C86567A.5060400-VPRAkNaXOzVS1MOuV/RT9w@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: "kliteyn-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org" Cc: Yevgeny Kliteynik , Sasha Khapyorsky , Linux RDMA List-Id: linux-rdma@vger.kernel.org Hi Yevgeny, On Tue, 7 Sep 2010 08:12:58 -0700 Yevgeny Kliteynik wrote: > > Signed-off-by: Yevgeny Kliteynik > --- > opensm/opensm/osm_console.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/opensm/opensm/osm_console.c b/opensm/opensm/osm_console.c > index bc7bea3..29a6c83 100644 > --- a/opensm/opensm/osm_console.c > +++ b/opensm/opensm/osm_console.c > @@ -1302,12 +1302,13 @@ static void dump_portguid_parse(char **p_last, osm_opensm_t * p_osm, FILE * out) > /* Check we have at least one expression to match */ > if (p_head_regexp == NULL) { > fprintf(out, "No valid expression provided. Aborting\n"); > + goto Exit; > return; While you are at it, shouldn't you remove the return here as well? Ira > } > > if (p_osm->sm.p_subn->need_update != 0) { > fprintf(out, "Subnet is not ready yet. Try again later\n"); > - return; > + goto Free_and_exit; > } > > /* Subnet doesn't need to be updated so we can carry on */ > @@ -1333,14 +1334,16 @@ static void dump_portguid_parse(char **p_last, osm_opensm_t * p_osm, FILE * out) > } > > CL_PLOCK_RELEASE(p_osm->sm.p_lock); > - if (output != out) > - fclose(output); > > +Free_and_exit: > for (; p_head_regexp; p_head_regexp = p_regexp) { > p_regexp = p_head_regexp->next; > regfree(&p_head_regexp->exp); > free(p_head_regexp); > } > +Exit: > + if (output != out) > + fclose(output); > } > > static void help_dump_portguid(FILE * out, int detail) > -- > 1.6.2.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://*vger.kernel.org/majordomo-info.html > -- Ira Weiny Math Programmer/Computer Scientist Lawrence Livermore National Lab 925-423-8008 weiny2-i2BcT+NCU+M@public.gmane.org -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html