From: Eric Sandeen Date: Thu, 2 Jul 2009 05:29:36 +0000 (-0500) Subject: xfs_repair: fix agcount*agblocks overflows X-Git-Tag: v3.0.3~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=003e8e41124707f55b20b376a6359dc7f6292991;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: fix agcount*agblocks overflows The last test in verify_ag_bno() may overflow: return (agbno >= (sbp->sb_dblocks - ((sbp->sb_agcount - 1) * sbp->sb_agblocks))); because sb_agcount & sb_agblocks are 32-bit integers; this may then miss corrupt agbnos for the last ag, which can in turn lead to out of bounds memory accesses later, for example when the block nr is used to offset in set_agbno_state(): addr = ba_bmap[(agno)] + (ag_blockno)/XR_BB_NUM; Similar problems in mk_incore_fstree Reported-by: Jesse Stroik Signed-off-by: Eric Sandeen Reviewed-by: Felix Blyakher --- diff --git a/repair/dinode.c b/repair/dinode.c index fdf52db61..84e1d0598 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -319,7 +319,8 @@ verify_ag_bno(xfs_sb_t *sbp, return (agbno >= sbp->sb_agblocks); if (agno == (sbp->sb_agcount - 1)) return (agbno >= (sbp->sb_dblocks - - ((sbp->sb_agcount - 1) * sbp->sb_agblocks))); + ((xfs_drfsbno_t)(sbp->sb_agcount - 1) * + sbp->sb_agblocks))); return 1; } diff --git a/repair/phase5.c b/repair/phase5.c index 2c243b62c..26f5aa22c 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -113,7 +113,8 @@ mk_incore_fstree(xfs_mount_t *mp, xfs_agnumber_t agno) ag_end = mp->m_sb.sb_agblocks; else ag_end = mp->m_sb.sb_dblocks - - mp->m_sb.sb_agblocks * (mp->m_sb.sb_agcount - 1); + (xfs_drfsbno_t)mp->m_sb.sb_agblocks * + (mp->m_sb.sb_agcount - 1); /* * ok, now find the number of extents, keep track of the