Re: [PATCH 1/6] misc: fix resource leaks in e2fsprogs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jan 21, 2014 at 03:25:54PM +0800, Zheng Liu wrote:
> On Mon, Jan 20, 2014 at 10:21:45PM -0800, Darrick J. Wong wrote:
> > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> 
> It seems that we will free 'fn' in ext2fs_free_icount().

Oh, so it is.  Ignore this patch, please.

--D
> 
>   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@xxxxxxxxxxxxxxx
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Reiser Filesystem Development]     [Ceph FS]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite National Park]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Device Mapper]     [Linux Media]

  Powered by Linux