ext4: Make sure quota files are not grabbed accidentally
Jan Kara
reviewerPATCH 1/1 ext4: Make sure quota files are not grabbed accidentally
If ext4 filesystem is corrupted so that quota files are linked from directory hirerarchy, bad things can happen. E.g. quota files can get corrupted or deleted. Make sure we are not grabbing quota file inodes when we expect normal inodes.
Signed-off-by Jan Kara <[email protected]>
--- fs/ext4/inode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ext4/inode.c +6 -2
@@ -4603,6 +4603,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,struct ext4_iloc iloc;struct ext4_inode *raw_inode;struct ext4_inode_info *ei; +struct ext4_super_block *es =EXT4_SB (sb)->s_es;struct inode *inode;journal_t *journal =EXT4_SB (sb)->s_journal;long ret;
@@ -4613,9 +4614,12 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,projid_t i_projid;if ((!(flags &EXT4_IGET_SPECIAL ) && - (ino <EXT4_FIRST_INO (sb) && ino !=EXT4_ROOT_INO )) || + ((ino <EXT4_FIRST_INO (sb) && ino !=EXT4_ROOT_INO ) || + ino ==le32_to_cpu (es->s_usr_quota_inum) || + ino ==le32_to_cpu (es->s_grp_quota_inum) || + ino ==le32_to_cpu (es->s_prj_quota_inum))) || (ino <EXT4_ROOT_INO ) || - (ino >le32_to_cpu (EXT4_SB (sb)->s_es->s_inodes_count))) { + (ino >le32_to_cpu (es->s_inodes_count))) {if (flags &EXT4_IGET_HANDLE )return ERR_PTR (-ESTALE ); __ext4_error(sb, function, line, false, EFSCORRUPTED, 0,
Signature · 1 line
2.26.2
Quoted 8 lines · Jan Kara
If ext4 filesystem is corrupted so that quota files are linked from directory hirerarchy, bad things can happen. E.g. quota files can get corrupted or deleted. Make sure we are not grabbing quota file inodes when we expect normal inodes.
[...]
Applied, thanks!
[1/1] ext4: Make sure quota files are not grabbed accidentally
commit: d7d6785de00f5b576c8b370331e2ca18259d3797
Best regards,
Signature · 1 line
Theodore Ts'o <[email protected]>