From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Khapyorsky Subject: Re: [infiniband-diags] [PATCH 2/2] fix potential segfault in ibnd_node_t destroy path Date: Fri, 13 Nov 2009 01:05:07 +0200 Message-ID: <20091112230507.GC7192@me> References: <1257531264.18550.70.camel@auk31.llnl.gov> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1257531264.18550.70.camel-X2zTWyBD0EhliZ7u+bvwcg@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Al Chu Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-rdma@vger.kernel.org On 10:14 Fri 06 Nov , Al Chu wrote: > Hey Sasha, > > There is a potential for the ports array in ibnd_node_t to be NULL if > you hit an error during scan and eventually destroy the fabric struct > before returning to the user. > > Al > > -- > Albert Chu > chu11-i2BcT+NCU+M@public.gmane.org > Computer Scientist > High Performance Systems Division > Lawrence Livermore National Laboratory > From: Albert Chu > Date: Thu, 5 Nov 2009 15:18:27 -0800 > Subject: [PATCH] fix potential segfault in ibnd_node_t destroy path > > > Signed-off-by: Albert Chu Applied with minor change (see below). Thanks. > --- > infiniband-diags/libibnetdisc/src/ibnetdisc.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c > index 62dff93..7ce9a54 100644 > --- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c > +++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c > @@ -605,10 +605,12 @@ static void destroy_node(ibnd_node_t * node) > { > int p = 0; > > - for (p = 0; p <= node->numports; p++) { > - free(node->ports[p]); > + if (node->ports) { > + for (p = 0; p <= node->numports; p++) { > + free(node->ports[p]); > + } Removing here unneeded braces around free(). Sasha > + free(node->ports); > } > - free(node->ports); > free(node); > } > > -- > 1.5.4.5 > -- 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