Commit c4b57287 authored by Ghanshyam Agrawal's avatar Ghanshyam Agrawal Committed by Yifan Qiao
Browse files

jfs: array-index-out-of-bounds fix in dtReadFirst 

mainline inclusion
from mainline-v6.13-rc1
commit ca84a2c9be482836b86d780244f0357e5a778c46
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAP0
CVE: CVE-2024-56598

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca84a2c9be482836b86d780244f0357e5a778c46



--------------------------------

The value of stbl can be sometimes out of bounds due
to a bad filesystem. Added a check with appopriate return
of error code in that case.

Reported-by: default avatar <syzbot+65fa06e29859e41a83f3@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=65fa06e29859e41a83f3


Signed-off-by: default avatarGhanshyam Agrawal <ghanshyam1898@gmail.com>
Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: default avatarYifan Qiao <qiaoyifan4@huawei.com>
parent 7e7ec9c2

fs/jfs/jfs_dtree.c

+7 −0
Original line number Diff line number Diff line
@@ -3384,6 +3384,13 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack) 


		/* get the leftmost entry */

		stbl = DT_GETSTBL(p);



		if (stbl[0] < 0 || stbl[0] > 127) {

			DT_PUTPAGE(mp);

			jfs_error(ip->i_sb, "stbl[0] out of bound\n");

			return -EIO;

		}



		xd = (pxd_t *) & p->slot[stbl[0]];



		/* get the child page block address */