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 v2 3/3] ext4: update 'state->fc_regions_size' after successful memory allocation
Date: Wed, 21 Sep 2022 13:32:27 +0200 [thread overview]
Message-ID: <20220921113227.g3zfv474tmpzfw75@quack3> (raw)
In-Reply-To: <20220921064040.3693255-4-yebin10@huawei.com>
On Wed 21-09-22 14:40:40, Ye Bin wrote:
> To avoid to 'state->fc_regions_size' mismatch with 'state->fc_regions'
> when fail to reallocate 'fc_reqions',only update 'state->fc_regions_size'
> after 'state->fc_regions' is allocated successfully.
>
> 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 | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
> index f5b0fc50ed47..694ab0627395 100644
> --- a/fs/ext4/fast_commit.c
> +++ b/fs/ext4/fast_commit.c
> @@ -1681,14 +1681,15 @@ int ext4_fc_record_regions(struct super_block *sb, int ino,
> if (state->fc_regions_used == state->fc_regions_size) {
> struct ext4_fc_alloc_region *fc_regions;
>
> - state->fc_regions_size +=
> - EXT4_FC_REPLAY_REALLOC_INCREMENT;
> fc_regions = krealloc(state->fc_regions,
> - state->fc_regions_size *
> - sizeof(struct ext4_fc_alloc_region),
> + sizeof(struct ext4_fc_alloc_region) *
> + (state->fc_regions_size +
> + EXT4_FC_REPLAY_REALLOC_INCREMENT),
> GFP_KERNEL);
> if (!fc_regions)
> return -ENOMEM;
> + state->fc_regions_size +=
> + EXT4_FC_REPLAY_REALLOC_INCREMENT;
> state->fc_regions = fc_regions;
> }
> region = &state->fc_regions[state->fc_regions_used++];
> --
> 2.31.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2022-09-21 11:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 6:40 [PATCH -next v2 0/3] Fix two potential memory leak Ye Bin
2022-09-21 6:40 ` [PATCH -next v2 1/3] ext4: fix potential memory leak in ext4_fc_record_modified_inode() Ye Bin
2022-09-21 11:31 ` Jan Kara
2022-09-21 6:40 ` [PATCH -next v2 2/3] ext4: fix potential memory leak in ext4_fc_record_regions() Ye Bin
2022-09-21 11:32 ` Jan Kara
2022-09-21 6:40 ` [PATCH -next v2 3/3] ext4: update 'state->fc_regions_size' after successful memory allocation Ye Bin
2022-09-21 11:32 ` Jan Kara [this message]
2022-09-21 16:38 ` Damien Guibouret
2022-09-30 3:19 ` [PATCH -next v2 0/3] Fix two potential memory leak 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=20220921113227.g3zfv474tmpzfw75@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;
as well as URLs for NNTP newsgroup(s).