Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: Do not try to validate extents on special files ext4: Ignore i_file_acl_high unless EXT4_FEATURE_INCOMPAT_64BIT is present ext4: Fix softlockup caused by illegal i_file_acl value in on-disk inode
This commit is contained in:
commit
e25c2c873f
|
@ -4357,11 +4357,9 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
|||
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
|
||||
inode->i_blocks = ext4_inode_blocks(raw_inode, ei);
|
||||
ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
|
||||
if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
|
||||
cpu_to_le32(EXT4_OS_HURD)) {
|
||||
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT))
|
||||
ei->i_file_acl |=
|
||||
((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;
|
||||
}
|
||||
inode->i_size = ext4_isize(raw_inode);
|
||||
ei->i_disksize = inode->i_size;
|
||||
inode->i_generation = le32_to_cpu(raw_inode->i_generation);
|
||||
|
@ -4409,9 +4407,23 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
|||
(__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32;
|
||||
}
|
||||
|
||||
if (ei->i_flags & EXT4_EXTENTS_FL) {
|
||||
/* Validate extent which is part of inode */
|
||||
ret = ext4_ext_check_inode(inode);
|
||||
ret = 0;
|
||||
if (ei->i_file_acl &&
|
||||
((ei->i_file_acl <
|
||||
(le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block) +
|
||||
EXT4_SB(sb)->s_gdb_count)) ||
|
||||
(ei->i_file_acl >= ext4_blocks_count(EXT4_SB(sb)->s_es)))) {
|
||||
ext4_error(sb, __func__,
|
||||
"bad extended attribute block %llu in inode #%lu",
|
||||
ei->i_file_acl, inode->i_ino);
|
||||
ret = -EIO;
|
||||
goto bad_inode;
|
||||
} else if (ei->i_flags & EXT4_EXTENTS_FL) {
|
||||
if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
|
||||
(S_ISLNK(inode->i_mode) &&
|
||||
!ext4_inode_is_fast_symlink(inode)))
|
||||
/* Validate extent which is part of inode */
|
||||
ret = ext4_ext_check_inode(inode);
|
||||
} else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
|
||||
(S_ISLNK(inode->i_mode) &&
|
||||
!ext4_inode_is_fast_symlink(inode))) {
|
||||
|
|
Loading…
Reference in a new issue