Skip to contentSkip to conversation

ext4: move 'ix' sanity check to corrent position

PATCH Applied [email protected] 2 participants 2 messages Sep 6, 2023 – Oct 6, 2023 ext4 file system

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 ext4: move 'ix' sanity check to corrent position

From: Gou Hao <[email protected]>

'ix' check should be before using it.

Fixes 80e675f906db ("ext4: optimize memmmove lengths in extent/index insertions")
Signed-off-by Gou Hao <[email protected]>
---
 fs/ext4/extents.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
fs/ext4/extents.c +5 -5
index 202c76996b62..4d8496d1a8ac 100644
@@ -1010,6 +1010,11 @@ static int ext4_ext_insert_index(handle_t *handle, struct inode *inode,
 		ix = curp->p_idx;
 	}
 
+	if (unlikely(ix > EXT_MAX_INDEX(curp->p_hdr))) {
+		EXT4_ERROR_INODE(inode, "ix > EXT_MAX_INDEX!");
+		return -EFSCORRUPTED;
+	}
+
 	len = EXT_LAST_INDEX(curp->p_hdr) - ix + 1;
 	BUG_ON(len < 0);
 	if (len > 0) {

@@ -1019,11 +1024,6 @@ static int ext4_ext_insert_index(handle_t *handle, struct inode *inode,
 		memmove(ix + 1, ix, len * sizeof(struct ext4_extent_idx));
 	}
 
-	if (unlikely(ix > EXT_MAX_INDEX(curp->p_hdr))) {
-		EXT4_ERROR_INODE(inode, "ix > EXT_MAX_INDEX!");
-		return -EFSCORRUPTED;
-	}
-
 	ix->ei_block = cpu_to_le32(logical);
 	ext4_idx_store_pblock(ix, ptr);
 	le16_add_cpu(&curp->p_hdr->eh_entries, 1);
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw
Quoted 3 lines · On Wed, 06 Sep 2023 09:33:41 +0800, [email protected] wrote:

'ix' check should be before using it.

Applied, thanks!

[1/1] ext4: move 'ix' sanity check to corrent position

      commit: af90a8f4a09ec4a3de20142e37f37205d4687f28

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>