From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q9C5iY7d072426 for ; Fri, 12 Oct 2012 00:44:34 -0500 Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id senmvo1XNgcwxyp8 for ; Thu, 11 Oct 2012 22:46:06 -0700 (PDT) Received: from disappointment ([192.168.1.1]) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1TMY37-0003ZH-Nu for xfs@oss.sgi.com; Fri, 12 Oct 2012 16:44:41 +1100 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1TMY2x-00056A-L8 for xfs@oss.sgi.com; Fri, 12 Oct 2012 16:44:31 +1100 From: Dave Chinner Subject: [PATCH 08/23] xfs: verify AGFL blocks as they are read from disk Date: Fri, 12 Oct 2012 16:44:14 +1100 Message-Id: <1350020669-19504-9-git-send-email-david@fromorbit.com> In-Reply-To: <1350020669-19504-1-git-send-email-david@fromorbit.com> References: <1350020669-19504-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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.sgi.com From: Dave Chinner Add an AGFL block verify callback function and pass it into the buffer read functions. Add a debug only check for valid block numbers in the AGFL. Signed-off-by: Dave Chinner --- fs/xfs/xfs_alloc.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index bd565a2..75c5d82 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c @@ -430,6 +430,29 @@ xfs_alloc_fixup_trees( return 0; } +void +xfs_agfl_read_verify( + struct xfs_buf *bp) +{ + struct xfs_mount *mp = bp->b_target->bt_mount; + struct xfs_agfl *agfl = XFS_BUF_TO_AGFL(bp); + int agfl_ok = 1; + int i; + + for (i = 0; i < XFS_AGFL_SIZE(mp); i++) { + if (agfl->agfl_bno[i] == 0) + agfl = 0; + } + + if (!agfl_ok) { + XFS_CORRUPTION_ERROR("xfs_agfl_read_verify", + XFS_ERRLEVEL_LOW, mp, agfl); + xfs_buf_ioerror(bp, EFSCORRUPTED); + } + bp->b_iodone = NULL; + xfs_buf_ioend(bp, 0); +} + /* * Read in the allocation group free block array. */ @@ -447,7 +470,7 @@ xfs_alloc_read_agfl( error = xfs_trans_read_buf( mp, tp, mp->m_ddev_targp, XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR(mp)), - XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL); + XFS_FSS_TO_BB(mp, 1), 0, &bp, xfs_agfl_read_verify); if (error) return error; ASSERT(!xfs_buf_geterror(bp)); -- 1.7.10 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs