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

Commit 00239acf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: do not use unchecked extent indices in xfs_bunmapi 



Make sure to only call xfs_iext_get_ext after we've validate the
extent index when moving on to the next index in xfs_bunmapi.  Also
remove the old workaround for too large indices that has been
superceeded by the proper fix in xfs_bmap_del_extent.

Based on an earlier patch from Lachlan McIlroy.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLachlan McIlroy <lmcilroy@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 5690f921

fs/xfs/xfs_bmap.c

+8 −8
Original line number Diff line number Diff line
@@ -5242,17 +5242,17 @@ xfs_bunmapi( 
nodelete:

		/*

		 * If not done go on to the next (previous) record.

		 * Reset ep in case the extents array was re-alloced.

		 */

		ep = xfs_iext_get_ext(ifp, lastx);

		if (bno != (xfs_fileoff_t)-1 && bno >= start) {

			if (lastx >= XFS_IFORK_NEXTENTS(ip, whichfork) ||

			    xfs_bmbt_get_startoff(ep) > bno) {

				if (--lastx >= 0)

			if (lastx >= 0) {

				ep = xfs_iext_get_ext(ifp, lastx);

				if (xfs_bmbt_get_startoff(ep) > bno) {

					if (--lastx >= 0)

						ep = xfs_iext_get_ext(ifp,

								      lastx);

				}

			if (lastx >= 0)

				xfs_bmbt_get_all(ep, &got);

			}

			extno++;

		}

	}