Skip to content

Commit b3ddf6b

Browse files
Eric Sandeengregkh
authored andcommitted
ext4: fix potential negative array index in do_split()
[ Upstream commit 5872331 ] If for any reason a directory passed to do_split() does not have enough active entries to exceed half the size of the block, we can end up iterating over all "count" entries without finding a split point. In this case, count == move, and split will be zero, and we will attempt a negative index into map[]. Guard against this by detecting this case, and falling back to split-to-half-of-count instead; in this case we will still have plenty of space (> half blocksize) in each split block. Fixes: ef2b02d ("ext34: ensure do_split leaves enough free space in both blocks") Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/f53e246b-647c-64bb-16ec-135383c70ad7@redhat.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7c89e40 commit b3ddf6b

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

fs/ext4/namei.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,7 +1732,7 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
17321732
blocksize, hinfo, map);
17331733
map -= count;
17341734
dx_sort_map(map, count);
1735-
/* Split the existing block in the middle, size-wise */
1735+
/* Ensure that neither split block is over half full */
17361736
size = 0;
17371737
move = 0;
17381738
for (i = count-1; i >= 0; i--) {
@@ -1742,8 +1742,18 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
17421742
size += map[i].size;
17431743
move++;
17441744
}
1745-
/* map index at which we will split */
1746-
split = count - move;
1745+
/*
1746+
* map index at which we will split
1747+
*
1748+
* If the sum of active entries didn't exceed half the block size, just
1749+
* split it in half by count; each resulting block will have at least
1750+
* half the space free.
1751+
*/
1752+
if (i > 0)
1753+
split = count - move;
1754+
else
1755+
split = count/2;
1756+
17471757
hash2 = map[split].hash;
17481758
continued = hash2 == map[split - 1].hash;
17491759
dxtrace(printk(KERN_INFO "Split block %lu at %x, %i/%i\n",

0 commit comments

Comments
 (0)