linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zheng Liu <gnehzuil.liu@gmail.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: tytso@mit.edu, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 1/6] misc: fix resource leaks in e2fsprogs
Date: Tue, 21 Jan 2014 15:25:54 +0800	[thread overview]
Message-ID: <20140121072553.GB1819@gmail.com> (raw)
In-Reply-To: <20140121062145.20507.54068.stgit@birch.djwong.org>

On Mon, Jan 20, 2014 at 10:21:45PM -0800, Darrick J. Wong wrote:
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

It seems that we will free 'fn' in ext2fs_free_icount().

  void ext2fs_free_icount(ext2_icount_t icount)
  {
          if (!icount)
                  return;
  
          icount->magic = 0;
          if (icount->list)
                  ext2fs_free_mem(&icount->list);
          if (icount->single)
                  ext2fs_free_inode_bitmap(icount->single);
          if (icount->multiple)
                  ext2fs_free_inode_bitmap(icount->multiple);
          if (icount->tdb)
                  tdb_close(icount->tdb);
          if (icount->tdb_fn) {
                  unlink(icount->tdb_fn);
                  free(icount->tdb_fn);
          }
  
          ext2fs_free_mem(&icount);
  }

Regards,
                                                - Zheng

> ---
>  lib/ext2fs/icount.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> 
> diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c
> index a3b20f0..7d1b3d5 100644
> --- a/lib/ext2fs/icount.c
> +++ b/lib/ext2fs/icount.c
> @@ -198,6 +198,7 @@ errcode_t ext2fs_create_icount_tdb(ext2_filsys fs, char *tdb_dir,
>  	fd = mkstemp(fn);
>  	if (fd < 0) {
>  		retval = errno;
> +		ext2fs_free_mem(&fn);
>  		goto errout;
>  	}
>  	umask(save_umask);
> @@ -216,6 +217,7 @@ errcode_t ext2fs_create_icount_tdb(ext2_filsys fs, char *tdb_dir,
>  	close(fd);
>  	if (icount->tdb == NULL) {
>  		retval = errno;
> +		ext2fs_free_mem(&fn);
>  		goto errout;
>  	}
>  	*ret = icount;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2014-01-21  7:21 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-21  6:21 [PATCH 0/6] miscellaneous e2fsprogs fixes Darrick J. Wong
2014-01-21  6:21 ` [PATCH 1/6] misc: fix resource leaks in e2fsprogs Darrick J. Wong
2014-01-21  7:25   ` Zheng Liu [this message]
2014-01-21 18:18     ` Darrick J. Wong
2014-01-21  6:21 ` [PATCH 2/6] mke2fs: clean up kernel version tests Darrick J. Wong
2014-01-21  7:32   ` Zheng Liu
2014-02-06 20:28     ` Theodore Ts'o
2014-01-21  6:21 ` [PATCH 3/6] libext2fs: iterate past lower extents during punch Darrick J. Wong
2014-01-21  7:40   ` Zheng Liu
2014-02-06 20:29     ` Theodore Ts'o
2014-01-21  6:22 ` [PATCH 4/6] libext2fs: during punch, fix parent extents after modifying extent Darrick J. Wong
2014-01-21  7:43   ` Zheng Liu
2014-02-06 20:31     ` Theodore Ts'o
2014-01-21  6:22 ` [PATCH 5/6] libext2fs: don't hang on to unmapped block if extent tree update fails Darrick J. Wong
2014-01-21  7:45   ` Zheng Liu
2014-01-21  6:22 ` [PATCH 6/6] libext2fs: try to roll back when splitting an extent fails Darrick J. Wong
2014-01-21  7:49   ` Zheng Liu
2014-02-06 20:34     ` Theodore Ts'o

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=20140121072553.GB1819@gmail.com \
    --to=gnehzuil.liu@gmail.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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;
as well as URLs for NNTP newsgroup(s).