lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: do not use unchecked extent indices in xfs_bmapi

Browse Source 
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_bmapi.

Based on an earlier patch from Lachlan McIlroy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Lachlan McIlroy <lmcilroy@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig
2011-05-11 15:04:07 +00:00
committed by Alex Elder
parent 2f2b3220b0
commit 5690f92199
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/xfs_bmap.c
View File

@@ -4825,12 +4825,13 @@ xfs_bmapi(
/* /*
* Else go on to the next record. * Else go on to the next record.
*/ */
ep = xfs_iext_get_ext(ifp, ++lastx);
prev = got; prev = got;
if (lastx >= nextents) if (++lastx < nextents) {
eof = 1; ep = xfs_iext_get_ext(ifp, lastx);
else
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
} else {
eof = 1;
}
} }
*nmap = n; *nmap = n;
/* /*