This is a note to let you know that I've just added the patch titled
ext4: fix potential memory leak in ext4_fc_record_regions()
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-fix-potential-memory-leak-in-ext4_fc_record_regions.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7069d105c1f15c442b68af43f7fde784f3126739 Mon Sep 17 00:00:00 2001
From: Ye Bin <yebin10@xxxxxxxxxx>
Date: Wed, 21 Sep 2022 14:40:39 +0800
Subject: ext4: fix potential memory leak in ext4_fc_record_regions()
From: Ye Bin <yebin10@xxxxxxxxxx>
commit 7069d105c1f15c442b68af43f7fde784f3126739 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@xxxxxxxxxx
Signed-off-by: Ye Bin <yebin10@xxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Link: https://lore.kernel.org/r/20220921064040.3693255-3-yebin10@xxxxxxxxxx
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/ext4/fast_commit.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -1687,15 +1687,17 @@ int ext4_fc_record_regions(struct super_
if (replay && 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) {
+ struct ext4_fc_alloc_region *fc_regions;
+
state->fc_regions_size +=
EXT4_FC_REPLAY_REALLOC_INCREMENT;
- state->fc_regions = krealloc(
- state->fc_regions,
- state->fc_regions_size *
- sizeof(struct ext4_fc_alloc_region),
- GFP_KERNEL);
- if (!state->fc_regions)
+ fc_regions = krealloc(state->fc_regions,
+ state->fc_regions_size *
+ sizeof(struct ext4_fc_alloc_region),
+ GFP_KERNEL);
+ if (!fc_regions)
return -ENOMEM;
+ state->fc_regions = fc_regions;
}
region = &state->fc_regions[state->fc_regions_used++];
region->ino = ino;
Patches currently in stable-queue which might be from yebin10@xxxxxxxxxx are
queue-6.0/ext4-update-state-fc_regions_size-after-successful-memory-allocation.patch
queue-6.0/jbd2-fix-potential-buffer-head-reference-count-leak.patch
queue-6.0/ext4-fix-miss-release-buffer-head-in-ext4_fc_write_inode.patch
queue-6.0/jbd2-fix-potential-use-after-free-in-jbd2_fc_wait_bufs.patch
queue-6.0/btrfs-fix-race-between-quota-enable-and-quota-rescan-ioctl.patch
queue-6.0/ext4-fix-potential-memory-leak-in-ext4_fc_record_modified_inode.patch
queue-6.0/ext4-fix-potential-memory-leak-in-ext4_fc_record_regions.patch
queue-6.0/jbd2-add-miss-release-buffer-head-in-fc_do_one_pass.patch
