linux-ext4 - Re: [PATCH 18/74] e2fsck: fix memory leaks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <52B077D7.8000307@redhat.com>
Date:	Tue, 17 Dec 2013 10:12:07 -0600
From:	Eric Sandeen <sandeen@...hat.com>
To:	"Darrick J. Wong" <darrick.wong@...cle.com>, tytso@....edu
CC:	linux-ext4@...r.kernel.org
Subject: Re: [PATCH 18/74] e2fsck: fix memory leaks

On 12/10/13, 7:20 PM, Darrick J. Wong wrote:
> Signed-off-by: Darrick J. Wong <darrick.wong@...cle.com>
> ---
>  e2fsck/journal.c |    4 +++-
>  e2fsck/pass3.c   |    5 +++--
>  e2fsck/profile.c |    2 ++
>  e2fsck/unix.c    |    2 ++
>  4 files changed, 10 insertions(+), 3 deletions(-)
> 
> 
> diff --git a/e2fsck/journal.c b/e2fsck/journal.c
> index e3f80bc..22f06e7 100644
> --- a/e2fsck/journal.c
> +++ b/e2fsck/journal.c
> @@ -1139,8 +1139,10 @@ int e2fsck_fix_ext3_journal_hint(e2fsck_t ctx)
>  	if (!journal_name)
>  		return 0;
>  
> -	if (stat(journal_name, &st) < 0)
> +	if (stat(journal_name, &st) < 0) {
> +		free(journal_name);
>  		return 0;
> +	}
>  
>  	if (st.st_rdev != sb->s_journal_dev) {
>  		clear_problem_context(&pctx);
> diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c
> index fbaadcf..6989f17 100644
> --- a/e2fsck/pass3.c
> +++ b/e2fsck/pass3.c
> @@ -53,7 +53,7 @@ static ext2fs_inode_bitmap inode_done_map = 0;
>  void e2fsck_pass3(e2fsck_t ctx)
>  {
>  	ext2_filsys fs = ctx->fs;
> -	struct dir_info_iter *iter;
> +	struct dir_info_iter *iter = NULL;
>  #ifdef RESOURCE_TRACK
>  	struct resource_track	rtrack;
>  #endif
> @@ -108,7 +108,6 @@ void e2fsck_pass3(e2fsck_t ctx)
>  			if (check_directory(ctx, dir->ino, &pctx))
>  				goto abort_exit;
>  	}
> -	e2fsck_dir_info_iter_end(ctx, iter);
>  
>  	/*
>  	 * Force the creation of /lost+found if not present
> @@ -123,6 +122,8 @@ void e2fsck_pass3(e2fsck_t ctx)
>  	e2fsck_rehash_directories(ctx);
>  
>  abort_exit:
> +	if (iter)
> +		e2fsck_dir_info_iter_end(ctx, iter);
>  	e2fsck_free_dir_info(ctx);
>  	if (inode_loop_detect) {
>  		ext2fs_free_inode_bitmap(inode_loop_detect);
> diff --git a/e2fsck/profile.c b/e2fsck/profile.c
> index 019c6f5..92aa893 100644
> --- a/e2fsck/profile.c
> +++ b/e2fsck/profile.c
> @@ -318,6 +318,8 @@ profile_init(const char **files, profile_t *ret_profile)
>          /* if the filenames list is not specified return an empty profile */
>          if ( files ) {
>  	    for (fs = files; !PROFILE_LAST_FILESPEC(*fs); fs++) {
> +		if (array)
> +			free_list(array);
>  		retval = get_dirlist(*fs, &array);
>  		if (retval == 0) {
>  			if (!array)


Coverity didn't quite like this.  You free it, but then it's later tested,
so we get double frees and such.  Need to assign it to NULL after freeing.

Darrick I think you're on the scan project right, so you can take a look,
CID 1138576.

-Eric


> diff --git a/e2fsck/unix.c b/e2fsck/unix.c
> index a6c8d25..7a8fce2 100644
> --- a/e2fsck/unix.c
> +++ b/e2fsck/unix.c
> @@ -869,6 +869,8 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
>  		case 'L':
>  			replace_bad_blocks++;
>  		case 'l':
> +			if (bad_blocks_file)
> +				free(bad_blocks_file);
>  			bad_blocks_file = string_copy(ctx, optarg, 0);
>  			break;
>  		case 'd':
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html