From: Brian Foster <bfoster@redhat.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/6] xfs_io: free fshandlep in parent_check()
Date: Tue, 5 Aug 2014 09:16:05 -0400 [thread overview]
Message-ID: <20140805131604.GB53538@bfoster.bfoster> (raw)
In-Reply-To: <1406905159-12415-2-git-send-email-sandeen@redhat.com>
On Fri, Aug 01, 2014 at 09:59:14AM -0500, Eric Sandeen wrote:
> The allocated fshandle wasn't freed in either normal
> exit or error paths.
>
> Do this, and consolidate cleanup into an out: target.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> io/parent.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/io/parent.c b/io/parent.c
> index ca989e9..56e126d 100644
> --- a/io/parent.c
> +++ b/io/parent.c
> @@ -258,9 +258,8 @@ parent_check(void)
> if (!bstatbuf || !parentbuf) {
> fprintf(stderr, _("unable to allocate buffers: %s\n"),
> strerror(errno));
> - free(bstatbuf);
> - free(parentbuf);
> - return 1;
> + err_status = 1;
> + goto out;
> }
>
> if (do_bulkstat(parentbuf, &parentbuf_size, bstatbuf, fsfd, fshandlep) != 0)
> @@ -272,8 +271,10 @@ parent_check(void)
> printf(_("succeeded checking %llu inodes\n"),
> (unsigned long long) inodes_checked);
>
> +out:
> free(bstatbuf);
> free(parentbuf);
> + free(fshandlep);
> return err_status;
> }
>
> --
> 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
next prev parent reply other threads:[~2014-08-05 13:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 14:59 [PATCH 0/6] xfsprogs: fix resource leaks Eric Sandeen
2014-08-01 14:59 ` [PATCH 1/6] xfs_io: free fshandlep in parent_check() Eric Sandeen
2014-08-05 13:16 ` Brian Foster [this message]
2014-08-01 14:59 ` [PATCH 2/6] xfs_fsr: fix leaks & catch error in fsrfile() Eric Sandeen
2014-08-05 13:16 ` Brian Foster
2014-08-01 14:59 ` [PATCH 3/6] xfs_fsr: free handlep in fsrfs Eric Sandeen
2014-08-05 13:16 ` Brian Foster
2014-08-01 14:59 ` [PATCH 4/6] libhandle: Fix handle leak in path_to_fshandle error paths Eric Sandeen
2014-08-05 13:31 ` Brian Foster
2014-08-01 14:59 ` [PATCH 5/6] xfs_io: fix leaks in parent_list() Eric Sandeen
2014-08-05 13:31 ` Brian Foster
2014-08-01 14:59 ` [PATCH 6/6] xfs_db: free flist on error in write_struct() Eric Sandeen
2014-08-05 13:31 ` Brian Foster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140805131604.GB53538@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=sandeen@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox