Commit 727e1acd authored by Chandan Babu R's avatar Chandan Babu R Committed by Darrick J. Wong
Browse files

xfs: Check for extent overflow when trivally adding a new extent 



When adding a new data extent (without modifying an inode's existing
extents) the extent count increases only by 1. This commit checks for
extent count overflow in such cases.

Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Signed-off-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b9b7e1dc

fs/xfs/libxfs/xfs_bmap.c

+6 −0
Original line number Diff line number Diff line
@@ -4527,6 +4527,12 @@ xfs_bmapi_convert_delalloc( 
		return error;



	xfs_ilock(ip, XFS_ILOCK_EXCL);



	error = xfs_iext_count_may_overflow(ip, whichfork,

			XFS_IEXT_ADD_NOSPLIT_CNT);

	if (error)

		goto out_trans_cancel;



	xfs_trans_ijoin(tp, ip, 0);



	if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &bma.icur, &bma.got) ||

fs/xfs/libxfs/xfs_inode_fork.h

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ struct xfs_ifork { 
#define	XFS_IFEXTENTS	0x02	/* All extent pointers are read in */

#define	XFS_IFBROOT	0x04	/* i_broot points to the bmap b-tree root */



/*

 * Worst-case increase in the fork extent count when we're adding a single

 * extent to a fork and there's no possibility of splitting an existing mapping.

 */

#define XFS_IEXT_ADD_NOSPLIT_CNT	(1)



/*

 * Fork handling.

 */

fs/xfs/xfs_bmap_item.c

+7 −0
Original line number Diff line number Diff line
@@ -508,6 +508,13 @@ xfs_bui_item_recover( 
	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, 0);



	if (bui_type == XFS_BMAP_MAP) {

		error = xfs_iext_count_may_overflow(ip, whichfork,

				XFS_IEXT_ADD_NOSPLIT_CNT);

		if (error)

			goto err_cancel;

	}



	count = bmap->me_len;

	error = xfs_trans_log_finish_bmap_update(tp, budp, bui_type, ip,

			whichfork, bmap->me_startoff, bmap->me_startblock,

fs/xfs/xfs_bmap_util.c

+5 −0
Original line number Diff line number Diff line
@@ -822,6 +822,11 @@ xfs_alloc_file_space( 
		if (error)

			goto error1;



		error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK,

				XFS_IEXT_ADD_NOSPLIT_CNT);

		if (error)

			goto error0;



		xfs_trans_ijoin(tp, ip, 0);



		error = xfs_bmapi_write(tp, ip, startoffset_fsb,

fs/xfs/xfs_dquot.c

+7 −1
Original line number Diff line number Diff line
@@ -314,8 +314,14 @@ xfs_dquot_disk_alloc( 
		return -ESRCH;

	}



	/* Create the block mapping. */

	xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);



	error = xfs_iext_count_may_overflow(quotip, XFS_DATA_FORK,

			XFS_IEXT_ADD_NOSPLIT_CNT);

	if (error)

		return error;



	/* Create the block mapping. */

	error = xfs_bmapi_write(tp, quotip, dqp->q_fileoffset,

			XFS_DQUOT_CLUSTER_SIZE_FSB, XFS_BMAPI_METADATA, 0, &map,

			&nmaps);