From: libaokun@huaweicloud.com
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
ritesh.list@gmail.com, ojaswin@linux.ibm.com,
linux-kernel@vger.kernel.org, yi.zhang@huawei.com,
yangerkun@huawei.com, libaokun@huaweicloud.com,
Baokun Li <libaokun1@huawei.com>,
stable@kernel.org
Subject: [PATCH v2 08/25] ext4: fix double brelse() the buffer of the extents path
Date: Thu, 22 Aug 2024 10:35:28 +0800 [thread overview]
Message-ID: <20240822023545.1994557-9-libaokun@huaweicloud.com> (raw)
In-Reply-To: <20240822023545.1994557-1-libaokun@huaweicloud.com>
From: Baokun Li <libaokun1@huawei.com>
In ext4_ext_try_to_merge_up(), set path[1].p_bh to NULL after it has been
released, otherwise it may be released twice. An example of what triggers
this is as follows:
split2 map split1
|--------|-------|--------|
ext4_ext_map_blocks
ext4_ext_handle_unwritten_extents
ext4_split_convert_extents
// path->p_depth == 0
ext4_split_extent
// 1. do split1
ext4_split_extent_at
|ext4_ext_insert_extent
| ext4_ext_create_new_leaf
| ext4_ext_grow_indepth
| le16_add_cpu(&neh->eh_depth, 1)
| ext4_find_extent
| // return -ENOMEM
|// get error and try zeroout
|path = ext4_find_extent
| path->p_depth = 1
|ext4_ext_try_to_merge
| ext4_ext_try_to_merge_up
| path->p_depth = 0
| brelse(path[1].p_bh) ---> not set to NULL here
|// zeroout success
// 2. update path
ext4_find_extent
// 3. do split2
ext4_split_extent_at
ext4_ext_insert_extent
ext4_ext_create_new_leaf
ext4_ext_grow_indepth
le16_add_cpu(&neh->eh_depth, 1)
ext4_find_extent
path[0].p_bh = NULL;
path->p_depth = 1
read_extent_tree_block ---> return err
// path[1].p_bh is still the old value
ext4_free_ext_path
ext4_ext_drop_refs
// path->p_depth == 1
brelse(path[1].p_bh) ---> brelse a buffer twice
Finally got the following WARRNING when removing the buffer from lru:
============================================
VFS: brelse: Trying to free free buffer
WARNING: CPU: 2 PID: 72 at fs/buffer.c:1241 __brelse+0x58/0x90
CPU: 2 PID: 72 Comm: kworker/u19:1 Not tainted 6.9.0-dirty #716
RIP: 0010:__brelse+0x58/0x90
Call Trace:
<TASK>
__find_get_block+0x6e7/0x810
bdev_getblk+0x2b/0x480
__ext4_get_inode_loc+0x48a/0x1240
ext4_get_inode_loc+0xb2/0x150
ext4_reserve_inode_write+0xb7/0x230
__ext4_mark_inode_dirty+0x144/0x6a0
ext4_ext_insert_extent+0x9c8/0x3230
ext4_ext_map_blocks+0xf45/0x2dc0
ext4_map_blocks+0x724/0x1700
ext4_do_writepages+0x12d6/0x2a70
[...]
============================================
Fixes: ecb94f5fdf4b ("ext4: collapse a single extent tree block into the inode if possible")
Cc: stable@kernel.org
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
---
fs/ext4/extents.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index cd2e71123a25..c4a4573440c1 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1890,6 +1890,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle,
path[0].p_hdr->eh_max = cpu_to_le16(max_root);
brelse(path[1].p_bh);
+ path[1].p_bh = NULL;
ext4_free_blocks(handle, inode, NULL, blk, 1,
EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
}
--
2.39.2
next prev parent reply other threads:[~2024-08-22 2:40 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 2:35 [PATCH v2 00/25] ext4: some bugfixes and cleanups for ext4 extents path libaokun
2024-08-22 2:35 ` [PATCH v2 01/25] ext4: refactor ext4_ext_rm_idx() to index 'path' libaokun
2024-08-22 2:35 ` [PATCH v2 02/25] ext4: prevent partial update of the extents path libaokun
2024-08-22 2:35 ` [PATCH v2 03/25] ext4: fix slab-use-after-free in ext4_split_extent_at() libaokun
2024-08-22 2:35 ` [PATCH v2 04/25] ext4: avoid use-after-free in ext4_ext_show_leaf() libaokun
2024-08-22 2:35 ` [PATCH v2 05/25] ext4: update orig_path in ext4_find_extent() libaokun
2024-08-27 18:04 ` Jan Kara
2024-08-22 2:35 ` [PATCH v2 06/25] ext4: aovid use-after-free in ext4_ext_insert_extent() libaokun
2024-08-27 18:07 ` Jan Kara
2024-08-22 2:35 ` [PATCH v2 07/25] ext4: drop ppath from ext4_ext_replay_update_ex() to avoid double-free libaokun
2024-08-22 2:35 ` libaokun [this message]
2024-08-22 2:35 ` [PATCH v2 09/25] ext4: add new ext4_ext_path_brelse() helper libaokun
2024-08-22 2:35 ` [PATCH v2 10/25] ext4: propagate errors from ext4_find_extent() in ext4_insert_range() libaokun
2024-08-22 2:35 ` [PATCH v2 11/25] ext4: get rid of ppath in ext4_find_extent() libaokun
2024-08-22 2:35 ` [PATCH v2 12/25] ext4: get rid of ppath in get_ext_path() libaokun
2024-08-22 2:35 ` [PATCH v2 13/25] ext4: get rid of ppath in ext4_ext_create_new_leaf() libaokun
2024-08-22 2:35 ` [PATCH v2 14/25] ext4: get rid of ppath in ext4_ext_insert_extent() libaokun
2024-08-22 2:35 ` [PATCH v2 15/25] ext4: get rid of ppath in ext4_split_extent_at() libaokun
2024-08-22 2:35 ` [PATCH v2 16/25] ext4: get rid of ppath in ext4_force_split_extent_at() libaokun
2024-08-22 2:35 ` [PATCH v2 17/25] ext4: get rid of ppath in ext4_split_extent() libaokun
2024-08-22 2:35 ` [PATCH v2 18/25] ext4: get rid of ppath in ext4_split_convert_extents() libaokun
2024-08-22 2:35 ` [PATCH v2 19/25] ext4: get rid of ppath in ext4_convert_unwritten_extents_endio() libaokun
2024-08-22 2:35 ` [PATCH v2 20/25] ext4: get rid of ppath in ext4_ext_convert_to_initialized() libaokun
2024-08-22 2:35 ` [PATCH v2 21/25] ext4: get rid of ppath in ext4_ext_handle_unwritten_extents() libaokun
2024-08-22 2:35 ` [PATCH v2 22/25] ext4: get rid of ppath in convert_initialized_extent() libaokun
2024-08-22 2:35 ` [PATCH v2 23/25] ext4: refactor ext4_swap_extents() to reuse extents path libaokun
2024-08-22 2:35 ` [PATCH v2 24/25] ext4: make some fast commit functions " libaokun
2024-08-22 2:35 ` [PATCH v2 25/25] ext4: save unnecessary indentation in ext4_ext_create_new_leaf() libaokun
2024-08-27 17:16 ` Jan Kara
2024-09-05 14:53 ` [PATCH v2 00/25] ext4: some bugfixes and cleanups for ext4 extents path Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240822023545.1994557-9-libaokun@huaweicloud.com \
--to=libaokun@huaweicloud.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=libaokun1@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojaswin@linux.ibm.com \
--cc=ritesh.list@gmail.com \
--cc=stable@kernel.org \
--cc=tytso@mit.edu \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox