bianbu-repo-mirror/bianbu-linux-6.6-fh
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6-fh synced 2025-04-25 02:57:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jfs: check if leafidx greater than num leaves per dmap tree

Browse source 
[ Upstream commit d64ff0d2306713ff084d4b09f84ed1a8c75ecc32 ]

syzbot report a out of bounds in dbSplit, it because dmt_leafidx greater
than num leaves per dmap tree, add a checking for dmt_leafidx in dbFindLeaf.

Shaggy:
Modified sanity check to apply to control pages as well as leaf pages.

Reported-and-tested-by: syzbot+dca05492eff41f604890@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=dca05492eff41f604890
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Edward Adam Davis 2024-08-24 09:25:23 +08:00 • committed by Greg Kroah-Hartman
parent 4218b31ecc
commit 7fff9a9f86
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/jfs/jfs_dmap.c
View file

@ -2944,9 +2944,10 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)
static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl) static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
{ {
int ti, n = 0, k, x = 0; int ti, n = 0, k, x = 0;
int max_size; int max_size, max_idx;
max_size = is_ctl ? CTLTREESIZE : TREESIZE; max_size = is_ctl ? CTLTREESIZE : TREESIZE;
max_idx = is_ctl ? LPERCTL : LPERDMAP;
/* first check the root of the tree to see if there is /* first check the root of the tree to see if there is
* sufficient free space. * sufficient free space.
@ -2978,6 +2979,8 @@ static int dbFindLeaf(dmtree_t *tp, int l2nb, int *leafidx, bool is_ctl)
*/ */
assert(n < 4); assert(n < 4);
} }
if (le32_to_cpu(tp->dmt_leafidx) >= max_idx)
return -ENOSPC;
/* set the return to the leftmost leaf describing sufficient /* set the return to the leftmost leaf describing sufficient
* free space. * free space.