* [PATCH] xfs: dabtree scrub needs to range-check level
@ 2019-03-18 16:42 Darrick J. Wong
2019-03-19 13:00 ` Brian Foster
0 siblings, 1 reply; 2+ messages in thread
From: Darrick J. Wong @ 2019-03-18 16:42 UTC (permalink / raw)
To: xfs
From: Darrick J. Wong <darrick.wong@oracle.com>
Make sure scrub's dabtree iterator function checks that we're not
going deeper in the stack than our cursor permits. Found by sparse.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/scrub/dabtree.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c
index c6ab123b6051..5c6175d074e0 100644
--- a/fs/xfs/scrub/dabtree.c
+++ b/fs/xfs/scrub/dabtree.c
@@ -604,6 +604,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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] xfs: dabtree scrub needs to range-check level
2019-03-18 16:42 [PATCH] xfs: dabtree scrub needs to range-check level Darrick J. Wong
@ 2019-03-19 13:00 ` Brian Foster
0 siblings, 0 replies; 2+ messages in thread
From: Brian Foster @ 2019-03-19 13:00 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs
On Mon, Mar 18, 2019 at 09:42:15AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Make sure scrub's dabtree iterator function checks that we're not
> going deeper in the stack than our cursor permits. Found by sparse.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/scrub/dabtree.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c
> index c6ab123b6051..5c6175d074e0 100644
> --- a/fs/xfs/scrub/dabtree.c
> +++ b/fs/xfs/scrub/dabtree.c
> @@ -604,6 +604,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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-19 13:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-18 16:42 [PATCH] xfs: dabtree scrub needs to range-check level Darrick J. Wong
2019-03-19 13:00 ` Brian Foster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.