From 5ef80b9f42a7da75f032a698e1660b96ab436145 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 20 Dec 2016 22:28:01 -0600 Subject: [PATCH] xfs_repair: fix bogus rmapbt record owner check Make the reverse mapping owner check actually validate inode numbers. Coverity-id: 1371628 Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- repair/scan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/repair/scan.c b/repair/scan.c index 0e13581c9..b9ef4dc3f 100644 --- a/repair/scan.c +++ b/repair/scan.c @@ -1052,8 +1052,12 @@ _("%s rmap btree block claimed (state %d), agno %d, bno %d, suspect %d\n"), } /* Look for impossible owners. */ - if (!(owner > 0 || (owner > XFS_RMAP_OWN_MIN && - owner <= XFS_RMAP_OWN_FS))) + if (!((owner > XFS_RMAP_OWN_MIN && + owner <= XFS_RMAP_OWN_FS) || + (XFS_INO_TO_AGNO(mp, owner) < mp->m_sb.sb_agcount && + XFS_AGINO_TO_AGBNO(mp, + XFS_INO_TO_AGINO(mp, owner)) < + mp->m_sb.sb_agblocks))) do_warn( _("invalid owner in rmap btree record %d (%"PRId64" %u) block %u/%u\n"), i, owner, len, agno, bno); -- 2.47.2