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 <[email protected]> Reported-by: butt3rflyh4ck <[email protected]>
ambv · Nov 13, 2020 · c61b3e4 · c61b3e4
1 parent 751341b
commit c61b3e4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.