From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n624DTca061473 for ; Wed, 1 Jul 2009 23:13:29 -0500 Received: from mail.sandeen.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 961F113359CC for ; Wed, 1 Jul 2009 21:14:00 -0700 (PDT) Received: from mail.sandeen.net (sandeen.net [209.173.210.139]) by cuda.sgi.com with ESMTP id CAgWbMoYOrnE699j for ; Wed, 01 Jul 2009 21:14:00 -0700 (PDT) Message-ID: <4A4C3407.60501@sandeen.net> Date: Wed, 01 Jul 2009 23:13:59 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH V3] xfs_repair: fix agcount*agblocks overflows References: <4A4BC7FF.6050004@sandeen.net> <4A4BE005.3000102@sandeen.net> In-Reply-To: <4A4BE005.3000102@sandeen.net> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs-oss , Jesse Stroik (V3: found another spot with this problem) 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 --- diff --git a/repair/dinode.c b/repair/dinode.c index fdf52db..84e1d05 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 2c243b6..77c7363 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 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs