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 987D97F52 for ; Fri, 7 Mar 2014 12:48:18 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 7CCA38F804C for ; Fri, 7 Mar 2014 10:48:18 -0800 (PST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id GAShSi0GK5BrCcel for ; Fri, 07 Mar 2014 10:48:17 -0800 (PST) Date: Fri, 7 Mar 2014 13:48:12 -0500 From: Brian Foster Subject: Re: [PATCH v2] xfsdump: Fix memory and fd leak in invutil/stobj.c Message-ID: <20140307184812.GA19284@laptop.bfoster> References: <1394203962-17080-1-git-send-email-ranto.boris@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1394203962-17080-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 Fri, Mar 07, 2014 at 03:52:42PM +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. > > Brian Foster noticed that the function also leaks a file descriptor > in case the file cannot be fstated. Fixing that, too. > > Signed-off-by: Boris Ranto > --- > invutil/stobj.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/invutil/stobj.c b/invutil/stobj.c > index 428b419..a74ba0f 100644 > --- a/invutil/stobj.c > +++ b/invutil/stobj.c > @@ -578,23 +578,24 @@ 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; > if (fstat(fd, &sb) < 0) { > fprintf(stderr, "Could not get stat info on %s\n", StObjFileName); > perror("fstat"); > + close(fd); > return -1; > } > 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); > } > The remaining failure cases all appear to exit(), including those in add_stobj(). Looks good to me, thanks for making that fix... Reviewed-by: Brian Foster > -- > 1.9.0 > > _______________________________________________ > 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