diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /fs/xfs/scrub/dabtree.c | |
| parent | ecc4946f11a07884f230450a6d5a92337bc21375 (diff) | |
| parent | dc4060a5dc2557e6b5aa813bf5b73677299d62d2 (diff) | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'fs/xfs/scrub/dabtree.c')
| -rw-r--r-- | fs/xfs/scrub/dabtree.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c index f1260b4bfdee..90527b094878 100644 --- a/fs/xfs/scrub/dabtree.c +++ b/fs/xfs/scrub/dabtree.c @@ -574,6 +574,11 @@ xchk_da_btree( /* Drill another level deeper. */ blkno = be32_to_cpu(key->before); level++; + if (level >= XFS_DA_NODE_MAXDEPTH) { + /* Too deep! */ + xchk_da_set_corrupt(&ds, level - 1); + break; + } ds.tree_level--; error = xchk_da_btree_block(&ds, level, blkno); if (error) |