From: Jan Kara <jack@suse.cz>
To: Ye Bin <yebin10@huawei.com>
Cc: tytso@mit.edu, adilger.kernel@dilger.ca,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
jack@suse.cz
Subject: Re: [PATCH -next 2/2] ext4: fix potential memory leak in ext4_fc_record_modified_inode()
Date: Mon, 19 Sep 2022 17:26:36 +0200 [thread overview]
Message-ID: <20220919152636.fe2gqx5xkk6tooem@quack3> (raw)
In-Reply-To: <20220919144021.2162295-3-yebin10@huawei.com>
On Mon 19-09-22 22:40:21, Ye Bin wrote:
> As krealloc may return NULL, in this case 'state->fc_modified_inodes'
> may not be freed by krealloc, but 'state->fc_modified_inodes' already
> set NULL. Then will lead to 'state->fc_modified_inodes' memory leak.
>
> Signed-off-by: Ye Bin <yebin10@huawei.com>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/fast_commit.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
> index cc8c8db075ba..5ab58cb4ce8d 100644
> --- a/fs/ext4/fast_commit.c
> +++ b/fs/ext4/fast_commit.c
> @@ -1486,13 +1486,15 @@ static int ext4_fc_record_modified_inode(struct super_block *sb, int ino)
> if (state->fc_modified_inodes[i] == ino)
> return 0;
> if (state->fc_modified_inodes_used == state->fc_modified_inodes_size) {
> - state->fc_modified_inodes = krealloc(
> - state->fc_modified_inodes,
> + int *fc_modified_inodes;
> +
> + fc_modified_inodes = krealloc(state->fc_modified_inodes,
> sizeof(int) * (state->fc_modified_inodes_size +
> EXT4_FC_REPLAY_REALLOC_INCREMENT),
> GFP_KERNEL);
> - if (!state->fc_modified_inodes)
> + if (!fc_modified_inodes)
> return -ENOMEM;
> + state->fc_modified_inodes = fc_modified_inodes;
> state->fc_modified_inodes_size +=
> EXT4_FC_REPLAY_REALLOC_INCREMENT;
> }
> --
> 2.31.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2022-09-19 15:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 14:40 [PATCH -next 0/2] Fix two potential memory leak Ye Bin
2022-09-19 14:40 ` [PATCH -next 1/2] ext4: fix potential memory leak in ext4_fc_record_regions() Ye Bin
2022-09-19 15:26 ` Jan Kara
2022-09-19 18:40 ` Damien Guibouret
2022-09-20 1:07 ` yebin
2022-09-20 18:25 ` Damien Guibouret
2022-09-21 1:26 ` yebin
2022-09-19 14:40 ` [PATCH -next 2/2] ext4: fix potential memory leak in ext4_fc_record_modified_inode() Ye Bin
2022-09-19 15:26 ` Jan Kara [this message]
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=20220919152636.fe2gqx5xkk6tooem@quack3 \
--to=jack@suse.cz \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=yebin10@huawei.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