From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9558B7F54 for ; Fri, 1 Aug 2014 09:59:24 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id 2B200AC006 for ; Fri, 1 Aug 2014 07:59:24 -0700 (PDT) Received: from sandeen.net (sandeen.net [63.231.237.45]) by cuda.sgi.com with ESMTP id zDau82bNwKjszAz3 for ; Fri, 01 Aug 2014 07:59:22 -0700 (PDT) From: Eric Sandeen Subject: [PATCH 2/6] xfs_fsr: fix leaks & catch error in fsrfile() Date: Fri, 1 Aug 2014 09:59:15 -0500 Message-Id: <1406905159-12415-3-git-send-email-sandeen@redhat.com> In-Reply-To: <1406905159-12415-1-git-send-email-sandeen@redhat.com> References: <1406905159-12415-1-git-send-email-sandeen@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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: xfs@oss.sgi.com The allocated fshandlep leaks on most error paths; restructure with an out: target that does all necessary freeing, and initialize filehandles to -1 so that we know whether they need to be closed on the error path. While we're at it, if gettmpname() fails, we still return 0 for an error, because error is initialized to 0 and only set otherwise by fsrfile_common. So if gettmpname() fails, we return success from the function even though we did no work. Fix that as well by initializing error to -1. Signed-off-by: Eric Sandeen --- fsr/xfs_fsr.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index 48629fd..752d2db 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -809,15 +809,15 @@ fsrfile(char *fname, xfs_ino_t ino) { xfs_bstat_t statbuf; jdm_fshandle_t *fshandlep; - int fd, fsfd; - int error = 0; + int fd = -1, fsfd = -1; + int error = -1; char *tname; fshandlep = jdm_getfshandle(getparent (fname) ); - if (! fshandlep) { + if (!fshandlep) { fsrprintf(_("unable to construct sys handle for %s: %s\n"), fname, strerror(errno)); - return -1; + goto out; } /* @@ -828,39 +828,39 @@ fsrfile(char *fname, xfs_ino_t ino) if (fsfd < 0) { fsrprintf(_("unable to open sys handle for %s: %s\n"), fname, strerror(errno)); - return -1; + goto out; } if ((xfs_bulkstat_single(fsfd, &ino, &statbuf)) < 0) { fsrprintf(_("unable to get bstat on %s: %s\n"), fname, strerror(errno)); - close(fsfd); - return -1; + goto out; } fd = jdm_open(fshandlep, &statbuf, O_RDWR|O_DIRECT); if (fd < 0) { fsrprintf(_("unable to open handle %s: %s\n"), fname, strerror(errno)); - close(fsfd); - return -1; + goto out; } /* Get the fs geometry */ if (xfs_getgeom(fsfd, &fsgeom) < 0 ) { fsrprintf(_("Unable to get geom on fs for: %s\n"), fname); - close(fsfd); - return -1; + goto out; } - close(fsfd); - tname = gettmpname(fname); if (tname) error = fsrfile_common(fname, tname, NULL, fd, &statbuf); - close(fd); +out: + if (fsfd >= 0) + close(fsfd); + if (fd >= 0) + close(fd); + free(fshandlep); return error; } -- 1.7.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs