提交 c3f730c9 编写于 作者: Y Ye Bin 提交者: Jialin Zhang

ext4: fix potential memory leak in ext4_fc_record_regions()

stable inclusion
from stable-v5.10.150
commit 2cfb769d60a2a57eb3566765428b6131cd16dcfe
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0XA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2cfb769d60a2a57eb3566765428b6131cd16dcfe

--------------------------------

commit 7069d105 upstream.

As krealloc may return NULL, in this case 'state->fc_regions' may not be
freed by krealloc, but 'state->fc_regions' already set NULL. Then will
lead to 'state->fc_regions' memory leak.

Cc: stable@kernel.org
Signed-off-by: NYe Bin <yebin10@huawei.com>
Reviewed-by: NJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220921064040.3693255-3-yebin10@huawei.comSigned-off-by: NTheodore Ts'o <tytso@mit.edu>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NJialin Zhang <zhangjialin11@huawei.com>
上级 19725b16
...@@ -1584,15 +1584,17 @@ int ext4_fc_record_regions(struct super_block *sb, int ino, ...@@ -1584,15 +1584,17 @@ int ext4_fc_record_regions(struct super_block *sb, int ino,
if (replay && state->fc_regions_used != state->fc_regions_valid) if (replay && state->fc_regions_used != state->fc_regions_valid)
state->fc_regions_used = state->fc_regions_valid; state->fc_regions_used = state->fc_regions_valid;
if (state->fc_regions_used == state->fc_regions_size) { if (state->fc_regions_used == state->fc_regions_size) {
struct ext4_fc_alloc_region *fc_regions;
state->fc_regions_size += state->fc_regions_size +=
EXT4_FC_REPLAY_REALLOC_INCREMENT; EXT4_FC_REPLAY_REALLOC_INCREMENT;
state->fc_regions = krealloc( fc_regions = krealloc(state->fc_regions,
state->fc_regions, state->fc_regions_size *
state->fc_regions_size * sizeof(struct ext4_fc_alloc_region),
sizeof(struct ext4_fc_alloc_region), GFP_KERNEL);
GFP_KERNEL); if (!fc_regions)
if (!state->fc_regions)
return -ENOMEM; return -ENOMEM;
state->fc_regions = fc_regions;
} }
region = &state->fc_regions[state->fc_regions_used++]; region = &state->fc_regions[state->fc_regions_used++];
region->ino = ino; region->ino = ino;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册