From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id A39547F50 for ; Thu, 6 Mar 2014 11:24:05 -0600 (CST) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id 950A38F8068 for ; Thu, 6 Mar 2014 09:24:02 -0800 (PST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id BTwd3PzrNpp1RwAS for ; Thu, 06 Mar 2014 09:24:01 -0800 (PST) Date: Thu, 6 Mar 2014 12:23:56 -0500 From: Brian Foster Subject: Re: [PATCH] xfsdump: Fix memory leak in invutil/stobj.c Message-ID: <20140306172356.GB11842@laptop.bfoster> References: <1394050311-17965-1-git-send-email-ranto.boris@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1394050311-17965-1-git-send-email-ranto.boris@gmail.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Boris Ranto Cc: branto@redhat.com, xfs@oss.sgi.com On Wed, Mar 05, 2014 at 09:11:51PM +0100, Boris Ranto wrote: > The function open_stobj duplicates its argument, upon successful > duplication, the fstat is called. If the fstat command fails then > the memory for the duplicated string is leaked. Fix this by moving > the string duplication after the fstat call. This is ok because > the fstat call does not use the duplicated string. > > Signed-off-by: Boris Ranto > --- The fix looks fine to me, but in the same scenario it looks like we also leak the fd. Care to clean that up in this patch as well? :) Brian > invutil/stobj.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/invutil/stobj.c b/invutil/stobj.c > index 428b419..55abe63 100644 > --- a/invutil/stobj.c > +++ b/invutil/stobj.c > @@ -578,12 +578,6 @@ open_stobj(char *StObjFileName) > return fd; > } > > - name = strdup(StObjFileName); > - if(name == NULL) { > - fprintf(stderr, "%s: internal memory error: strdup stobj_name\n", g_programName); > - exit(1); > - } > - > read_n_bytes(fd, &cnt, sizeof(invt_sescounter_t), StObjFileName); > lseek( fd, 0, SEEK_SET ); > errno = 0; > @@ -595,6 +589,12 @@ open_stobj(char *StObjFileName) > size = sb.st_size; > mapaddr = mmap_n_bytes(fd, size, BOOL_FALSE, StObjFileName); > > + name = strdup(StObjFileName); > + if(name == NULL) { > + fprintf(stderr, "%s: internal memory error: strdup stobj_name\n", g_programName); > + exit(1); > + } > + > return add_stobj(name, fd, size, mapaddr, (invt_sescounter_t *)mapaddr); > } > > -- > 1.7.1 > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs