Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b36ec042 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: fix freeing of inodes not yet added to the inode cache 



When freeing an inode that lost race getting added to the inode cache we
must not call into ->destroy_inode, because that would delete the inode
that won the race from the inode cache radix tree.

This patch uses splits a new xfs_inode_free helper out of xfs_ireclaim
and uses that plus __destroy_inode to make sure we really only free
the memory allocted for the inode that lost the race, and not mess with
the inode cache state.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reported-by: default avatarAlex Samad <alex@samad.com.au>
Reported-by: default avatarAndrew Randrianasulu <randrik@mail.ru>
Reported-by: default avatarStephane <sharnois@max-t.com>
Reported-by: default avatarTommy <tommy@news-service.com>
Reported-by: default avatarMiah Gregory <mace@darksilence.net>
Reported-by: default avatarGabriel Barazer <gabriel@oxeva.fr>
Reported-by: default avatarLeandro Lucarella <llucax@gmail.com>
Reported-by: default avatarDaniel Burr <dburr@fami.com.au>
Reported-by: default avatarNickolay <newmail@spaces.ru>
Reported-by: default avatarMichael Guntsche <mike@it-loops.com>
Reported-by: default avatarDan Carley <dan.carley+linuxkern-bugs@gmail.com>
Reported-by: default avatarMichael Ole Olsen <gnu@gmx.net>
Reported-by: default avatarMichael Weissenbacher <mw@dermichi.com>
Reported-by: default avatarMartin Spott <Martin.Spott@mgras.net>
Reported-by: default avatarChristian Kujau <lists@nerdbynature.de>
Tested-by: default avatarMichael Guntsche <mike@it-loops.com>
Tested-by: default avatarDan Carley <dan.carley+linuxkern-bugs@gmail.com>
Tested-by: default avatarChristian Kujau <lists@nerdbynature.de>
parent 2e00c97e

fs/xfs/xfs_iget.c

+68 −57
Original line number Diff line number Diff line
@@ -116,6 +116,71 @@ xfs_inode_alloc( 
	return ip;

}



STATIC void

xfs_inode_free(

	struct xfs_inode	*ip)

{

	switch (ip->i_d.di_mode & S_IFMT) {

	case S_IFREG:

	case S_IFDIR:

	case S_IFLNK:

		xfs_idestroy_fork(ip, XFS_DATA_FORK);

		break;

	}



	if (ip->i_afp)

		xfs_idestroy_fork(ip, XFS_ATTR_FORK);



#ifdef XFS_INODE_TRACE

	ktrace_free(ip->i_trace);

#endif

#ifdef XFS_BMAP_TRACE

	ktrace_free(ip->i_xtrace);

#endif

#ifdef XFS_BTREE_TRACE

	ktrace_free(ip->i_btrace);

#endif

#ifdef XFS_RW_TRACE

	ktrace_free(ip->i_rwtrace);

#endif

#ifdef XFS_ILOCK_TRACE

	ktrace_free(ip->i_lock_trace);

#endif

#ifdef XFS_DIR2_TRACE

	ktrace_free(ip->i_dir_trace);

#endif



	if (ip->i_itemp) {

		/*

		 * Only if we are shutting down the fs will we see an

		 * inode still in the AIL. If it is there, we should remove

		 * it to prevent a use-after-free from occurring.

		 */

		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;

		struct xfs_ail	*ailp = lip->li_ailp;



		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||

				       XFS_FORCED_SHUTDOWN(ip->i_mount));

		if (lip->li_flags & XFS_LI_IN_AIL) {

			spin_lock(&ailp->xa_lock);

			if (lip->li_flags & XFS_LI_IN_AIL)

				xfs_trans_ail_delete(ailp, lip);

			else

				spin_unlock(&ailp->xa_lock);

		}

		xfs_inode_item_destroy(ip);

		ip->i_itemp = NULL;

	}



	/* asserts to verify all state is correct here */

	ASSERT(atomic_read(&ip->i_iocount) == 0);

	ASSERT(atomic_read(&ip->i_pincount) == 0);

	ASSERT(!spin_is_locked(&ip->i_flags_lock));

	ASSERT(completion_done(&ip->i_flush));



	kmem_zone_free(xfs_inode_zone, ip);

}



/*

 * Check the validity of the inode we just found it the cache

 */
@@ -292,7 +357,8 @@ xfs_iget_cache_miss( 
	if (lock_flags)

		xfs_iunlock(ip, lock_flags);

out_destroy:

	xfs_destroy_inode(ip);

	__destroy_inode(VFS_I(ip));

	xfs_inode_free(ip);

	return error;

}
@@ -497,62 +563,7 @@ xfs_ireclaim( 
	xfs_qm_dqdetach(ip);

	xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);



	switch (ip->i_d.di_mode & S_IFMT) {

	case S_IFREG:

	case S_IFDIR:

	case S_IFLNK:

		xfs_idestroy_fork(ip, XFS_DATA_FORK);

		break;

	}



	if (ip->i_afp)

		xfs_idestroy_fork(ip, XFS_ATTR_FORK);



#ifdef XFS_INODE_TRACE

	ktrace_free(ip->i_trace);

#endif

#ifdef XFS_BMAP_TRACE

	ktrace_free(ip->i_xtrace);

#endif

#ifdef XFS_BTREE_TRACE

	ktrace_free(ip->i_btrace);

#endif

#ifdef XFS_RW_TRACE

	ktrace_free(ip->i_rwtrace);

#endif

#ifdef XFS_ILOCK_TRACE

	ktrace_free(ip->i_lock_trace);

#endif

#ifdef XFS_DIR2_TRACE

	ktrace_free(ip->i_dir_trace);

#endif

	if (ip->i_itemp) {

		/*

		 * Only if we are shutting down the fs will we see an

		 * inode still in the AIL. If it is there, we should remove

		 * it to prevent a use-after-free from occurring.

		 */

		xfs_log_item_t	*lip = &ip->i_itemp->ili_item;

		struct xfs_ail	*ailp = lip->li_ailp;



		ASSERT(((lip->li_flags & XFS_LI_IN_AIL) == 0) ||

				       XFS_FORCED_SHUTDOWN(ip->i_mount));

		if (lip->li_flags & XFS_LI_IN_AIL) {

			spin_lock(&ailp->xa_lock);

			if (lip->li_flags & XFS_LI_IN_AIL)

				xfs_trans_ail_delete(ailp, lip);

			else

				spin_unlock(&ailp->xa_lock);

		}

		xfs_inode_item_destroy(ip);

		ip->i_itemp = NULL;

	}

	/* asserts to verify all state is correct here */

	ASSERT(atomic_read(&ip->i_iocount) == 0);

	ASSERT(atomic_read(&ip->i_pincount) == 0);

	ASSERT(!spin_is_locked(&ip->i_flags_lock));

	ASSERT(completion_done(&ip->i_flush));

	kmem_zone_free(xfs_inode_zone, ip);

	xfs_inode_free(ip);

}



/*

fs/xfs/xfs_inode.h

+0 −17
Original line number Diff line number Diff line
@@ -309,23 +309,6 @@ static inline struct inode *VFS_I(struct xfs_inode *ip) 
	return &ip->i_vnode;

}



/*

 * Get rid of a partially initialized inode.

 *

 * We have to go through destroy_inode to make sure allocations

 * from init_inode_always like the security data are undone.

 *

 * We mark the inode bad so that it takes the short cut in

 * the reclaim path instead of going through the flush path

 * which doesn't make sense for an inode that has never seen the

 * light of day.

 */

static inline void xfs_destroy_inode(struct xfs_inode *ip)

{

	make_bad_inode(VFS_I(ip));

	return destroy_inode(VFS_I(ip));

}



/*

 * i_flags helper functions

 */