diff options
| author | Ye Bin <[email protected]> | 2022-09-21 06:40:40 +0000 |
|---|---|---|
| committer | Theodore Ts'o <[email protected]> | 2022-10-01 03:46:54 +0000 |
| commit | 27cd49780381c6ccbf248798e5e8fd076200ffba (patch) | |
| tree | 7d996ef870a7671004a066499ec4857beca88c1d /fs/ext4/fast_commit.c | |
| parent | ext4: fix potential memory leak in ext4_fc_record_regions() (diff) | |
| download | kernel-27cd49780381c6ccbf248798e5e8fd076200ffba.tar.gz kernel-27cd49780381c6ccbf248798e5e8fd076200ffba.zip | |
ext4: update 'state->fc_regions_size' after successful memory allocation
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.
Cc: [email protected]
Signed-off-by: Ye Bin <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>
Diffstat (limited to 'fs/ext4/fast_commit.c')
| -rw-r--r-- | fs/ext4/fast_commit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 5ab58cb4ce8d..9549d89b3519 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++]; |