summaryrefslogtreecommitdiffstats
path: root/fs/jfs
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2020-11-13 14:58:46 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:51:40 +0100
commitcbeb61258186978c26f9ee738c86fe4812cc27af (patch)
tree20f0693617fa065b77dd390d9c1bf26e18220197 /fs/jfs
parent8ee70b6db88238b1e1fc7623256086fc125a60a8 (diff)
downloadlinux-stable-cbeb61258186978c26f9ee738c86fe4812cc27af.tar.gz
linux-stable-cbeb61258186978c26f9ee738c86fe4812cc27af.tar.bz2
linux-stable-cbeb61258186978c26f9ee738c86fe4812cc27af.zip
jfs: Fix array index bounds check in dbAdjTree
commit c61b3e4839007668360ed8b87d7da96d2e59fc6c upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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.