Commit 46811b5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-inode' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs inode update from Al Viro:
 "Saner inode_init_always(), also fixing a nilfs problem"

* tag 'pull-inode' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: fix UAF/GPF bug in nilfs_mdt_destroy
parents ffb39098 2e488f13

fs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ int inode_init_always(struct super_block *sb, struct inode *inode) 
	inode->i_wb_frn_history = 0;

#endif



	if (security_inode_alloc(inode))

		goto out;

	spin_lock_init(&inode->i_lock);

	lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
@@ -228,11 +226,12 @@ int inode_init_always(struct super_block *sb, struct inode *inode) 
	inode->i_fsnotify_mask = 0;

#endif

	inode->i_flctx = NULL;



	if (unlikely(security_inode_alloc(inode)))

		return -ENOMEM;

	this_cpu_inc(nr_inodes);



	return 0;

out:

	return -ENOMEM;

}

EXPORT_SYMBOL(inode_init_always);