-stable review patch. If anyone has any objections, please let us know.
------------------
This is CVE-2006-0554 and SGI bug 942658. With certain types of
ftruncate() activity on 2.6 kernels, XFS can end up exposing stale
data off disk to a user, putting extents where holes should be.
Signed-off-by: Chris Wright <[email protected]>
---
fs/xfs/linux-2.6/xfs_aops.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.15.4.orig/fs/xfs/linux-2.6/xfs_aops.c
+++ linux-2.6.15.4/fs/xfs/linux-2.6/xfs_aops.c
@@ -385,7 +385,7 @@ xfs_probe_unmapped_cluster(
/* First sum forwards in this page */
do {
- if (buffer_mapped(bh))
+ if (buffer_mapped(bh) || !buffer_uptodate(bh))
break;
total += bh->b_size;
} while ((bh = bh->b_this_page) != head);
--