ext4: check if directory block is within i_size

[linux-2.6-microblaze.git] / fs / ext4 / namei.c

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 1c6725e..7fced54 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -110,6 +110,13 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
        struct ext4_dir_entry *dirent;
        int is_dx_block = 0;
 
+       if (block >= inode->i_size) {
+               ext4_error_inode(inode, func, line, block,
+                      "Attempting to read directory block (%u) that is past i_size (%llu)",
+                      block, inode->i_size);
+               return ERR_PTR(-EFSCORRUPTED);
+       }
+
        if (ext4_simulate_fail(inode->i_sb, EXT4_SIM_DIRBLOCK_EIO))
                bh = ERR_PTR(-EIO);
        else