diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-09-01 11:15:49 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-10-22 16:40:55 -0700 |
| commit | 4d74157d2bc6a3ed4c8f41b4ecbc930e32927bb5 (patch) | |
| tree | ea520801563f0b493094c689c860ccf4abb5a9d3 /fs | |
| parent | 72561f5b7d7ce3dc37e9c9daccd2f85a648eaa09 (diff) | |
xfs: check that bc_nlevels never overflows
Warn if we ever bump nlevels higher than the allowed maximum cursor
height.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_btree.c | 3 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_btree_staging.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index e6d9f7caaf1a..b0a7d3047dcd 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -2944,6 +2944,7 @@ xfs_btree_promote_leaf_iroot( /* Zap the old root and change the tree height. */ xfs_iroot_free(cur->bc_ino.ip, cur->bc_ino.whichfork); cur->bc_nlevels++; + ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS); cur->bc_ptrs[1] = 1; /* @@ -2999,6 +3000,7 @@ xfs_btree_promote_node_iroot( */ be16_add_cpu(&block->bb_level, 1); cur->bc_nlevels++; + ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS); cur->bc_ptrs[level + 1] = 1; /* @@ -3235,6 +3237,7 @@ xfs_btree_new_root( xfs_btree_setbuf(cur, cur->bc_nlevels, nbp); cur->bc_ptrs[cur->bc_nlevels] = nptr; cur->bc_nlevels++; + ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS); *stat = 1; return 0; error0: diff --git a/fs/xfs/libxfs/xfs_btree_staging.c b/fs/xfs/libxfs/xfs_btree_staging.c index f3097674564e..6d9c89d8c918 100644 --- a/fs/xfs/libxfs/xfs_btree_staging.c +++ b/fs/xfs/libxfs/xfs_btree_staging.c @@ -712,6 +712,7 @@ xfs_btree_bload_compute_geometry( * block-based btree level. */ cur->bc_nlevels++; + ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS); xfs_btree_bload_level_geometry(cur, bbl, level, nr_this_level, &avg_per_block, &level_blocks, &dontcare64); @@ -727,6 +728,7 @@ xfs_btree_bload_compute_geometry( /* Otherwise, we need another level of btree. */ cur->bc_nlevels++; + ASSERT(cur->bc_nlevels <= XFS_BTREE_MAXLEVELS); } nr_blocks += level_blocks; |