diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-12-05 12:33:54 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-05 12:33:54 +1100 |
| commit | bb3be7e7c1c18e1b141d4cadeb98cc89ecf78099 (patch) | |
| tree | ebc408a6b29da392335d2969b5bb2bd760b3ed5e /fs/xfs | |
| parent | d2a047f31e86941fa896e0e3271536d50aba415e (diff) | |
| download | linux-stable-bb3be7e7c1c18e1b141d4cadeb98cc89ecf78099.tar.gz linux-stable-bb3be7e7c1c18e1b141d4cadeb98cc89ecf78099.tar.bz2 linux-stable-bb3be7e7c1c18e1b141d4cadeb98cc89ecf78099.zip | |
xfs: check for bogus values in btree block headers
When we're reading a btree block, make sure that what we retrieved
matches the owner and level; and has a plausible number of records.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_btree.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 0e80993c8a59..21e6a6ab6b9a 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -1769,8 +1769,28 @@ xfs_btree_lookup_get_block( if (error) return error; + /* Check the inode owner since the verifiers don't. */ + if (xfs_sb_version_hascrc(&cur->bc_mp->m_sb) && + (cur->bc_flags & XFS_BTREE_LONG_PTRS) && + be64_to_cpu((*blkp)->bb_u.l.bb_owner) != + cur->bc_private.b.ip->i_ino) + goto out_bad; + + /* Did we get the level we were looking for? */ + if (be16_to_cpu((*blkp)->bb_level) != level) + goto out_bad; + + /* Check that internal nodes have at least one record. */ + if (level != 0 && be16_to_cpu((*blkp)->bb_numrecs) == 0) + goto out_bad; + xfs_btree_setbuf(cur, level, bp); return 0; + +out_bad: + *blkp = NULL; + xfs_trans_brelse(cur->bc_tp, bp); + return -EFSCORRUPTED; } /* |