summaryrefslogtreecommitdiffstats
path: root/fs/jfs
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2020-11-13 14:58:46 -0600
committerDave Kleikamp <dave.kleikamp@oracle.com>2020-11-13 16:03:07 -0600
commitc61b3e4839007668360ed8b87d7da96d2e59fc6c (patch)
tree8496901a442f4d76018f027cb0f4da194ef0dfdc /fs/jfs
parent751341b4d7841e2b76e78eec382c2e119165497f (diff)
downloadlinux-stable-c61b3e4839007668360ed8b87d7da96d2e59fc6c.tar.gz
linux-stable-c61b3e4839007668360ed8b87d7da96d2e59fc6c.tar.bz2
linux-stable-c61b3e4839007668360ed8b87d7da96d2e59fc6c.zip
jfs: Fix array index bounds check in dbAdjTree
Bounds checking tools can flag a bug in dbAdjTree() for an array index out of bounds in dmt_stree. Since dmt_stree can refer to the stree in both structures dmaptree and dmapctl, use the larger array to eliminate the false positive. Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Reported-by: butt3rflyh4ck <butterflyhuangxx@gmail.com>
Diffstat (limited to 'fs/jfs')
-rw-r--r--fs/jfs/jfs_dmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dmap.h b/fs/jfs/jfs_dmap.h
index 29891fad3f09..aa03a904d5ab 100644
--- a/fs/jfs/jfs_dmap.h
+++ b/fs/jfs/jfs_dmap.h
@@ -183,7 +183,7 @@ typedef union dmtree {
#define dmt_leafidx t1.leafidx
#define dmt_height t1.height
#define dmt_budmin t1.budmin
-#define dmt_stree t1.stree
+#define dmt_stree t2.stree
/*
* on-disk aggregate disk allocation map descriptor.