| Message ID | 20220921064040.3693255-4-yebin10@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | Fix two potential memory leak | expand |
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 >
Hello, That's fine for me. Regards, Damien Le 21/09/2022 à 13:32, Jan Kara a écrit : > 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 >>
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++];
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> --- fs/ext4/fast_commit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)