diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2020-11-13 14:58:46 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-29 13:45:06 +0100 |
| commit | 2c7c903caef18d45bac879557861656aa30b8933 (patch) | |
| tree | be08e6304c40df3d29309f631711ae814e534ec8 /fs/jfs | |
| parent | 494c2c5ef3d4224d7b193a2f4a9fc92f9a8cd454 (diff) | |
| download | linux-stable-2c7c903caef18d45bac879557861656aa30b8933.tar.gz linux-stable-2c7c903caef18d45bac879557861656aa30b8933.tar.bz2 linux-stable-2c7c903caef18d45bac879557861656aa30b8933.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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dmap.h b/fs/jfs/jfs_dmap.h index 562b9a7e4311..f502a15c6c98 100644 --- a/fs/jfs/jfs_dmap.h +++ b/fs/jfs/jfs_dmap.h @@ -196,7 +196,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. |