Before we get into libxfs_initialize_perag and try to blindly
allocate a perag struct for every (possibly corrupted number of)
AGs, see if we can read the last one. If not, assume it's corrupt,
and load only the first AG.
Do this only for an arbitrarily high-ish agcount, so that normal-ish
geometry on a possibly truncated file or device will still do
its best to make all readable AGs available.
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---
diff --git a/libxfs/init.c b/libxfs/init.c
index a08575a..ca5101e 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -817,6 +817,28 @@ libxfs_mount(
return NULL;
}
+ /*
+ * libxfs_initialize_perag will allocate a perag structure for each AG.
+ * If agcount is corrupted and insanely high, this will OOM the box.
+ * If the agount seems (arbitrarily) high, try to read what would be
+ * the last AG, and if that fails, just read the first one and let
+ * the user know what happened.
+ */
+ if (sbp->sb_agcount > 10000) {
+ error = xfs_read_agf(mp, NULL, sbp->sb_agcount - 1, 0, &bp);
+ if (error) {
+ fprintf(stderr, _("%s: read of AG %d failed\n"),
+ progname, sbp->sb_agcount);
+ if (!(flags & LIBXFS_MOUNT_DEBUGGER))
+ return NULL;
+ fprintf(stderr, _("%s: limiting reads to AG 0\n"),
+ progname);
+ sbp->sb_agcount = 1;
+ }
+ if (bp)
+ libxfs_putbuf(bp);
+ }
+
error = libxfs_initialize_perag(mp, sbp->sb_agcount, &mp->m_maxagi);
if (error) {
fprintf(stderr, _("%s: perag init failed\n"),
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
