xfs_db: fix unaligned accesses

Fix 2 unaligned accesses in xfs_db which caused bus errors on
sparc64.  Similar treatment was already done in xfs_repair and
xfs_metadump but somehow xfs_db got missed.

Thanks to Anatoly for reminding me that unaligned access is
a thing.  ;)

Resolves-oss-bugzilla: #1140
Reported-by: Anatoly Pugachev <matorola@gmail.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/db/check.c b/db/check.c
index c626a5c3c4f8cedb4d33044fb7289f1ffc812e49..0871ed792e06fb7a4b7b82bfc7097b32213ea89e 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -2202,7 +2202,7 @@ process_btinode(
                pp = XFS_BMDR_PTR_ADDR(dib, 1, xfs_bmdr_maxrecs(
                                XFS_DFORK_SIZE(dip, mp, whichfork), 0));
                for (i = 0; i < be16_to_cpu(dib->bb_numrecs); i++)
-                       scan_lbtree(be64_to_cpu(pp[i]),
+                       scan_lbtree(get_unaligned_be64(&pp[i]),
                                        be16_to_cpu(dib->bb_level),
                                        scanfunc_bmap, type, id, totd, toti,
                                        nex, blkmapp, 1,

diff --git a/db/frag.c b/db/frag.c
index 3beb4168b8e8287168b39249d930d15ac506bc25..36bb6895b4140dd4c8f0dbbe95eac41948301216 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -258,8 +258,8 @@ process_btinode(
        pp = XFS_BMDR_PTR_ADDR(dib, 1,
                xfs_bmdr_maxrecs(XFS_DFORK_SIZE(dip, mp, whichfork), 0));
        for (i = 0; i < be16_to_cpu(dib->bb_numrecs); i++)
-               scan_lbtree(be64_to_cpu(pp[i]), be16_to_cpu(dib->bb_level),
-                       scanfunc_bmap, extmapp,
+               scan_lbtree(get_unaligned_be64(&pp[i]),
+                        be16_to_cpu(dib->bb_level), scanfunc_bmap, extmapp,
                        whichfork == XFS_DATA_FORK ? TYP_BMAPBTD : TYP_BMAPBTA);
 }