Commit 61a1d87a authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o

ext4: fix check for block being out of directory size

The check in __ext4_read_dirblock() for block being outside of directory
size was wrong because it compared block number against directory size
in bytes. Fix it.

Fixes: 65f8ea4c ("ext4: check if directory block is within i_size")
CVE: CVE-2022-1184
CC: stable@vger.kernel.org
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarLukas Czerner <lczerner@redhat.com>
Link: https://lore.kernel.org/r/20220822114832.1482-1-jack@suse.czSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5bdf402a
...@@ -126,7 +126,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode, ...@@ -126,7 +126,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
struct ext4_dir_entry *dirent; struct ext4_dir_entry *dirent;
int is_dx_block = 0; int is_dx_block = 0;
if (block >= inode->i_size) { if (block >= inode->i_size >> inode->i_blkbits) {
ext4_error_inode(inode, func, line, block, ext4_error_inode(inode, func, line, block,
"Attempting to read directory block (%u) that is past i_size (%llu)", "Attempting to read directory block (%u) that is past i_size (%llu)",
block, inode->i_size); block, inode->i_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment