xfs_metadump: Make -F (force) optional
PATCH 1/1 xfs_metadump: Make -F (force) optional
If we do something crazy like:
# xfs_metadump /root/anaconda.cfg outfile
xfs_metadump will pass "-F" to xfs_db to carry on even in the face of bad superblock magic. [1] Depending on what we gave as an input file, we may very well fail quite badly:
Quoted 2 lines
xfs_metadump:/root/anaconda.cfgis not a valid XFS filesystem (unexpected SB magic number0x230a2320) Floating point exception
I don't think it's possible to harden every path through libxfs for non-xfs filesystems as input. (Even if it's possible, I don't think it's worth the effort).
So I propose making the "-F" optional; by default, xfs_metadump will say no, this has bad magic, I'm stopping. If the admin really wants to try to proceed, suggest that they can use "-F" and they can keep all the broken pieces.
[1] behavior added in 7f98455 xfs_db: exit on invalid magic number
---
db/init.c +3 -1
@@ -140,8 +140,10 @@ init(if (sbp->sb_magicnum !=XFS_SB_MAGIC ) {fprintf (stderr,_ ("%s: %s is not a valid XFS filesystem (unexpected SB magic number 0x%08x)\n" ), progname, fsdevice, sbp->sb_magicnum); -if (!force) +if (!force) { +fprintf (stderr,_ ("Use -F to force a read attempt.\n" ));exit (EXIT_FAILURE ); + } } mp = libxfs_mount(&xmount, sbp, x.ddev, x.logdev, x.rtdev,
db/xfs_metadump.sh +3 -2
@@ -5,7 +5,7 @@ OPTS=" " DBOPTS=" " -USAGE="Usage: xfs_metadump [-efogwV] [-m max_extents] [-l logdev] source target" +USAGE="Usage: xfs_metadump [-efFogwV] [-m max_extents] [-l logdev] source target" while getopts "efgl:m:owV" c do
@@ -17,6 +17,7 @@ do w) OPTS=$OPTS"-w ";; f) DBOPTS=$DBOPTS" -f";; l) DBOPTS=$DBOPTS" -l "$OPTARG" ";; + F) DBOPTS=$DBOPTS" -F";; V) xfs_db -p xfs_metadump -V status=$? exit $status
@@ -29,7 +30,7 @@ done set -- extra $@ shift $OPTIND case $# in - 2) xfs_db$DBOPTS -F -i -p xfs_metadump -c "metadump$OPTS $2" $1 + 2) xfs_db$DBOPTS -i -p xfs_metadump -c "metadump$OPTS $2" $1 status=$? ;; *) echo $USAGE 1>&2
man/man8/xfs_metadump.8 +6 -1
@@ -4,7 +4,7 @@ xfs_metadump \- copy XFS filesystem metadata to a file .SH SYNOPSIS .B xfs_metadump [ -.B \-efgow +.B \-efFgow ] [ .B \-m .I max_extents
@@ -86,6 +86,11 @@ file option). This can also happen if an image copy of a filesystem has been made into an ordinary file with .BR xfs_copy (8). .TP +.B \-F +Specifies that we want to continue even if the superblock magic is not correct. +If the source is truly not an XFS filesystem, the resulting image will be useless, +and xfs_metadump may crash. +.TP .B \-g Shows dump progress. This is sent to stdout if the .I target
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Looks good,
Quoted 10 lines
xfs_metadumpwill pass "-F" toxfs_dbto carry on even in the face of bad superblock magic. [1] Depending on what we gave as an input file, we may very well fail quite badly:Quoted 2 lines
xfs_metadump:/root/anaconda.cfgis not a valid XFS filesystem (unexpected SB magic number0x230a2320) Floating point exceptionI don't think it's possible to harden every path through libxfs for non-xfs filesystems as input. (Even if it's possible, I don't think it's worth the effort).
Can you add a test to verify that xfs_metadump now correctly rejects files that don't have a valid superblock?
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Christoph Hellwig
Looks good,
Reviewed-by Christoph Hellwig <[email protected]>Quoted 7 lines
xfs_metadumpwill pass "-F" toxfs_dbto carry on even in the face of bad superblock magic. [1] Depending on what we gave as an input file, we may very well fail quite badly:Quoted 2 lines
xfs_metadump:/root/anaconda.cfgis not a valid XFS filesystem (unexpected SB magic number0x230a2320) Floating point exception
Quoted 6 lines
Quoted 3 lines
I don't think it's possible to harden every path through libxfs for non-xfs filesystems as input. (Even if it's possible, I don't think it's worth the effort).
Can you add a test to verify that
xfs_metadumpnow correctly rejects files that don't have a valid superblock?
ok, can do.
Thanks Christoph,
-Eric
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
This has been committed.
Thanks
--Rich
commit 4e83ac7b7416edb52815c6e5f4ca64dadfa5f974
Author: Eric Sandeen <[email protected]> Date: Thu Dec 12 17:47:59 2013 +0000
xfs_metadump: Make -F (force) optional
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs