Commit fd2186d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 fixes from Ted Ts'o:
 "Fix two regressions in ext4 and a number of issues reported by syzbot"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: enable the lazy init thread when remounting read/write
  ext4: fix fsync for non-directories
  ext4: add lockdep annotations for i_data_sem for ea_inode's
  ext4: disallow ea_inodes with extended attributes
  ext4: set lockdep subclass for the ea_inode in ext4_xattr_inode_cache_find()
  ext4: add EA_INODE checking to ext4_iget()
parents 48b1320a eb1f822c

fs/ext4/ext4.h

+4 −1
Original line number Diff line number Diff line
@@ -918,11 +918,13 @@ do { \ 
 *			  where the second inode has larger inode number

 *			  than the first

 *  I_DATA_SEM_QUOTA  - Used for quota inodes only

 *  I_DATA_SEM_EA     - Used for ea_inodes only

 */

enum {

	I_DATA_SEM_NORMAL = 0,

	I_DATA_SEM_OTHER,

	I_DATA_SEM_QUOTA,

	I_DATA_SEM_EA

};
@@ -2901,7 +2903,8 @@ typedef enum { 
	EXT4_IGET_NORMAL =	0,

	EXT4_IGET_SPECIAL =	0x0001, /* OK to iget a system inode */

	EXT4_IGET_HANDLE = 	0x0002,	/* Inode # is from a handle */

	EXT4_IGET_BAD =		0x0004  /* Allow to iget a bad inode */

	EXT4_IGET_BAD =		0x0004, /* Allow to iget a bad inode */

	EXT4_IGET_EA_INODE =	0x0008	/* Inode should contain an EA value */

} ext4_iget_flags;



extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,

fs/ext4/fsync.c

+7 −0
Original line number Diff line number Diff line
@@ -108,6 +108,13 @@ static int ext4_fsync_journal(struct inode *inode, bool datasync, 
	journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;

	tid_t commit_tid = datasync ? ei->i_datasync_tid : ei->i_sync_tid;



	/*

	 * Fastcommit does not really support fsync on directories or other

	 * special files. Force a full commit.

	 */

	if (!S_ISREG(inode->i_mode))

		return ext4_force_commit(inode->i_sb);



	if (journal->j_flags & JBD2_BARRIER &&

	    !jbd2_trans_will_send_data_barrier(journal, commit_tid))

		*needs_barrier = true;

fs/ext4/inode.c

+29 −5
Original line number Diff line number Diff line
@@ -4641,6 +4641,24 @@ static inline void ext4_inode_set_iversion_queried(struct inode *inode, u64 val) 
		inode_set_iversion_queried(inode, val);

}



static const char *check_igot_inode(struct inode *inode, ext4_iget_flags flags)



{

	if (flags & EXT4_IGET_EA_INODE) {

		if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL))

			return "missing EA_INODE flag";

		if (ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||

		    EXT4_I(inode)->i_file_acl)

			return "ea_inode with extended attributes";

	} else {

		if ((EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL))

			return "unexpected EA_INODE flag";

	}

	if (is_bad_inode(inode) && !(flags & EXT4_IGET_BAD))

		return "unexpected bad inode w/o EXT4_IGET_BAD";

	return NULL;

}



struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,

			  ext4_iget_flags flags, const char *function,

			  unsigned int line)
@@ -4650,6 +4668,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, 
	struct ext4_inode_info *ei;

	struct ext4_super_block *es = EXT4_SB(sb)->s_es;

	struct inode *inode;

	const char *err_str;

	journal_t *journal = EXT4_SB(sb)->s_journal;

	long ret;

	loff_t size;
@@ -4677,8 +4696,14 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, 
	inode = iget_locked(sb, ino);

	if (!inode)

		return ERR_PTR(-ENOMEM);

	if (!(inode->i_state & I_NEW))

	if (!(inode->i_state & I_NEW)) {

		if ((err_str = check_igot_inode(inode, flags)) != NULL) {

			ext4_error_inode(inode, function, line, 0, err_str);

			iput(inode);

			return ERR_PTR(-EFSCORRUPTED);

		}

		return inode;

	}



	ei = EXT4_I(inode);

	iloc.bh = NULL;
@@ -4944,10 +4969,9 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, 
	if (IS_CASEFOLDED(inode) && !ext4_has_feature_casefold(inode->i_sb))

		ext4_error_inode(inode, function, line, 0,

				 "casefold flag without casefold feature");

	if (is_bad_inode(inode) && !(flags & EXT4_IGET_BAD)) {

		ext4_error_inode(inode, function, line, 0,

				 "bad inode without EXT4_IGET_BAD flag");

		ret = -EUCLEAN;

	if ((err_str = check_igot_inode(inode, flags)) != NULL) {

		ext4_error_inode(inode, function, line, 0, err_str);

		ret = -EFSCORRUPTED;

		goto bad_inode;

	}

fs/ext4/super.c

+12 −12
Original line number Diff line number Diff line
@@ -6588,18 +6588,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb) 
		}

	}



	/*

	 * Reinitialize lazy itable initialization thread based on

	 * current settings

	 */

	if (sb_rdonly(sb) || !test_opt(sb, INIT_INODE_TABLE))

		ext4_unregister_li_request(sb);

	else {

		ext4_group_t first_not_zeroed;

		first_not_zeroed = ext4_has_uninit_itable(sb);

		ext4_register_li_request(sb, first_not_zeroed);

	}



	/*

	 * Handle creation of system zone data early because it can fail.

	 * Releasing of existing data is done when we are sure remount will
@@ -6637,6 +6625,18 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb) 
	if (enable_rw)

		sb->s_flags &= ~SB_RDONLY;



	/*

	 * Reinitialize lazy itable initialization thread based on

	 * current settings

	 */

	if (sb_rdonly(sb) || !test_opt(sb, INIT_INODE_TABLE))

		ext4_unregister_li_request(sb);

	else {

		ext4_group_t first_not_zeroed;

		first_not_zeroed = ext4_has_uninit_itable(sb);

		ext4_register_li_request(sb, first_not_zeroed);

	}



	if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))

		ext4_stop_mmpd(sbi);

fs/ext4/xattr.c

+12 −29
Original line number Diff line number Diff line
@@ -121,7 +121,11 @@ ext4_expand_inode_array(struct ext4_xattr_inode_array **ea_inode_array, 
#ifdef CONFIG_LOCKDEP

void ext4_xattr_inode_set_class(struct inode *ea_inode)

{

	struct ext4_inode_info *ei = EXT4_I(ea_inode);



	lockdep_set_subclass(&ea_inode->i_rwsem, 1);

	(void) ei;	/* shut up clang warning if !CONFIG_LOCKDEP */

	lockdep_set_subclass(&ei->i_data_sem, I_DATA_SEM_EA);

}

#endif
@@ -433,7 +437,7 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, 
		return -EFSCORRUPTED;

	}



	inode = ext4_iget(parent->i_sb, ea_ino, EXT4_IGET_NORMAL);

	inode = ext4_iget(parent->i_sb, ea_ino, EXT4_IGET_EA_INODE);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

		ext4_error(parent->i_sb,
@@ -441,23 +445,6 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, 
			   err);

		return err;

	}



	if (is_bad_inode(inode)) {

		ext4_error(parent->i_sb,

			   "error while reading EA inode %lu is_bad_inode",

			   ea_ino);

		err = -EIO;

		goto error;

	}



	if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL)) {

		ext4_error(parent->i_sb,

			   "EA inode %lu does not have EXT4_EA_INODE_FL flag",

			    ea_ino);

		err = -EINVAL;

		goto error;

	}



	ext4_xattr_inode_set_class(inode);



	/*
@@ -478,9 +465,6 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, 


	*ea_inode = inode;

	return 0;

error:

	iput(inode);

	return err;

}



/* Remove entry from mbcache when EA inode is getting evicted */
@@ -1556,11 +1540,11 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value, 


	while (ce) {

		ea_inode = ext4_iget(inode->i_sb, ce->e_value,

				     EXT4_IGET_NORMAL);

		if (!IS_ERR(ea_inode) &&

		    !is_bad_inode(ea_inode) &&

		    (EXT4_I(ea_inode)->i_flags & EXT4_EA_INODE_FL) &&

		    i_size_read(ea_inode) == value_len &&

				     EXT4_IGET_EA_INODE);

		if (IS_ERR(ea_inode))

			goto next_entry;

		ext4_xattr_inode_set_class(ea_inode);

		if (i_size_read(ea_inode) == value_len &&

		    !ext4_xattr_inode_read(ea_inode, ea_data, value_len) &&

		    !ext4_xattr_inode_verify_hashes(ea_inode, NULL, ea_data,

						    value_len) &&
@@ -1570,9 +1554,8 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value, 
			kvfree(ea_data);

			return ea_inode;

		}



		if (!IS_ERR(ea_inode))

		iput(ea_inode);

	next_entry:

		ce = mb_cache_entry_find_next(ea_inode_cache, ce);

	}

	kvfree(ea_data);