]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_repair: fix bogus rmapbt record owner check
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 21 Dec 2016 04:28:01 +0000 (22:28 -0600)
committerEric Sandeen <sandeen@redhat.com>
Wed, 21 Dec 2016 04:28:01 +0000 (22:28 -0600)
Make the reverse mapping owner check actually validate inode numbers.

Coverity-id: 1371628
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
repair/scan.c

index 0e13581c9b0565a837374688ee499ad49aab73e9..b9ef4dc3f040d23759d92f47f21e293bd40afa32 100644 (file)
@@ -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);