| Message ID | 20220921064040.3693255-2-yebin10@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | Fix two potential memory leak | expand |
On Wed 21-09-22 14:40:38, 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> Still looks good to me. I think this didn't change since last time, did it? 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 88575f3d0dc5..29a22ee0adb8 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 >
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 88575f3d0dc5..29a22ee0adb8 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; }
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> --- fs/ext4/fast_commit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)