From 90a08c2366b74c635f83eaabc8e976f575224eea Mon Sep 17 00:00:00 2001 From: yangerkun Date: Sat, 30 Oct 2021 17:35:47 +0800 Subject: [PATCH] ext4: avoid recheck extent for EXT4_EX_FORCE_CACHE hulk inclusion category: bugfix bugzilla: 109246 CVE: NA --------------------------- Buffer with verified means that it has been checked before. No need verify and call set_buffer_verified again. Signed-off-by: yangerkun Reviewed-by: Jan Kara Signed-off-by: Yang Yingliang --- fs/ext4/extents.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e2803e6c2b17..d3936a78dc39 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -589,13 +589,16 @@ __read_extent_tree_block(const char *function, unsigned int line, if (err < 0) goto errout; } - if (buffer_verified(bh) && !(flags & EXT4_EX_FORCE_CACHE)) - return bh; - err = __ext4_ext_check(function, line, inode, ext_block_hdr(bh), - depth, pblk, le32_to_cpu(idx->ei_block)); - if (err) - goto errout; - set_buffer_verified(bh); + if (buffer_verified(bh)) { + if (!(flags & EXT4_EX_FORCE_CACHE)) + return bh; + } else { + err = __ext4_ext_check(function, line, inode, ext_block_hdr(bh), + depth, pblk, le32_to_cpu(idx->ei_block)); + if (err) + goto errout; + set_buffer_verified(bh); + } /* * If this is a leaf block, cache all of its entries */ -- GitLab