Commit 7a19dee1 authored Oct 30, 2014 by Jan Kara Committed by Dave Chinner Oct 30, 2014

xfs: Check error during inode btree iteration in xfs_bulkstat()



xfs_bulkstat() doesn't check error return from xfs_btree_increment(). In
case of specific fs corruption that could result in xfs_bulkstat()
entering an infinite loop because we would be looping over the same
chunk over and over again. Fix the problem by checking the return value
and terminating the loop properly.

Coverity-id: 1231338
cc: <stable@vger.kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Jie Liu <jeff.u.liu@gmail.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent a6bbce54

fs/xfs/xfs_itable.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,10 @@ xfs_bulkstat(
		*/
		agino = r.ir_startino + XFS_INODES_PER_CHUNK;
		error = xfs_btree_increment(cur, 0, &tmp);
		if (error) {
		end_of_ag = 1;
		goto del_cursor;
		}
		cond_resched();
		}

Admin message