Message-ID: <5dceb32a-2c30-0a99-ef87-6218c9c6a931@huawei.com>
Date:   Fri, 10 Dec 2021 11:35:08 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
From:   zhanchengbin <zhanchengbin1@huawei.com>
Subject: Re: [PATCH] setup_tdb : fix memory leak
To:     Theodore Ts'o <tytso@mit.edu>
CC:     <linux-ext4@vger.kernel.org>, <liuzhiqiang26@huawei.com>,
        <linfeilong@huawei.com>
References: <3a0cbb4e-6ea3-356a-433d-3a7a6466b018@huawei.com>
In-Reply-To: <3a0cbb4e-6ea3-356a-433d-3a7a6466b018@huawei.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

ping

在 2021/11/30 14:40, zhanchengbin 写道:
> In setup_tdb(), need free tdb_dir before return,
> otherwise it will cause memory leak.
> 
> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
> Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
> ---
>   e2fsck/dirinfo.c | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
> index 49d624c5..a2b36d8e 100644
> --- a/e2fsck/dirinfo.c
> +++ b/e2fsck/dirinfo.c
> @@ -49,7 +49,7 @@ static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs)
>       ext2_ino_t        threshold;
>       errcode_t        retval;
>       mode_t            save_umask;
> -    char            *tdb_dir, uuid[40];
> +    char            *tdb_dir = NULL, uuid[40];
>       int            fd, enable;
> 
>       profile_get_string(ctx->profile, "scratch_files", "directory", 0, 0,
> @@ -61,11 +61,11 @@ static void setup_tdb(e2fsck_t ctx, ext2_ino_t 
> num_dirs)
> 
>       if (!enable || !tdb_dir || access(tdb_dir, W_OK) ||
>           (threshold && num_dirs <= threshold))
> -        return;
> +        goto error;
> 
>       retval = ext2fs_get_mem(strlen(tdb_dir) + 64, &db->tdb_fn);
>       if (retval)
> -        return;
> +        goto error;
> 
>       uuid_unparse(ctx->fs->super->s_uuid, uuid);
>       sprintf(db->tdb_fn, "%s/%s-dirinfo-XXXXXX", tdb_dir, uuid);
> @@ -74,7 +74,7 @@ static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs)
>       umask(save_umask);
>       if (fd < 0) {
>           db->tdb = NULL;
> -        return;
> +        goto error;
>       }
> 
>       if (num_dirs < 99991)
> @@ -83,6 +83,11 @@ static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs)
>       db->tdb = tdb_open(db->tdb_fn, num_dirs, TDB_NOLOCK | TDB_NOSYNC,
>                  O_RDWR | O_CREAT | O_TRUNC, 0600);
>       close(fd);
> +
> +error:
> +    if(tdb_dir) {
> +        free(tdb_dir);
> +    }
>   }
>   #endif
>