summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorYe Bin <yebin10@huawei.com>2022-09-21 14:40:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-21 12:37:51 +0200
commit24d39affc6be1acf6df86a8c3e2413b8a73749c7 (patch)
tree60e6085a3c5353d903e314d8996037d4fde53a25 /fs
parent92429a93c792d8cfc135444e7b9bd2108f78c313 (diff)
downloadlinux-stable-24d39affc6be1acf6df86a8c3e2413b8a73749c7.tar.gz
linux-stable-24d39affc6be1acf6df86a8c3e2413b8a73749c7.tar.bz2
linux-stable-24d39affc6be1acf6df86a8c3e2413b8a73749c7.zip
ext4: fix potential memory leak in ext4_fc_record_modified_inode()
commit 9305721a309fa1bd7c194e0d4a2335bf3b29dca4 upstream. 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. Cc: stable@kernel.org Signed-off-by: Ye Bin <yebin10@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20220921064040.3693255-2-yebin10@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/fast_commit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index b7414a5812f6..fa63ad20958f 100644
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -1494,13 +1494,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;
}