Re: [PATCH] jfs: fix array-index-out-of-bounds in dbFindLeaf

From: Manas Ghandat
Date: Sat Sep 02 2023 - 14:10:01 EST


Actually I was talking about the stree attribute of dmtree which is present in both dmaptree and dmapctl.

Link : https://elixir.bootlin.com/linux/v6.5.1/source/fs/jfs/jfs_dmap.h#L168

Since it is an array we can add a check for the size of array like the code below.


+            if (x + n > (sizeof(tp->dmt_stree)/sizeof(s8)))
+                 return -ENOSPC;

On 01/09/23 22:38, Dave Kleikamp wrote:
On 8/31/23 10:19AM, Manas Ghandat wrote:
I was wondering if we could implement a get_tree_size macro wherein  we could find the tree size so that we can do the comparison. SInce the tp->dmt_stree is an array we can get its size and fix the out of bounds. Would this thing work?

dmtree_t is a union of two nearly identical structures that both contain an stree. The only real difference in the structures is the size of the stree, so dbFindLeaf doesn't really know which is being used by the caller.