Commit 6a5f73f5 authored Jan 02, 2025 by Ghanshyam Agrawal Committed by Long Li Jan 02, 2025

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

mainline inclusion
from mainline-v6.10-rc2
commit 839f102efb168f02dfdd46717b7c6dddb26b015e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAOO
CVE: CVE-2024-56596

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



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

The stbl might contain some invalid values. Added a check to
return error code in that case.

Reported-by:  <syzbot+0315f8fe99120601ba88@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=0315f8fe99120601ba88


Signed-off-by: Ghanshyam Agrawal <ghanshyam1898@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Long Li <leo.lilong@huawei.com>

parent c2f1662c

fs/jfs/jfs_dtree.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -2891,6 +2891,14 @@ int jfs_readdir(struct file file, struct dir_context ctx)
		stbl = DT_GETSTBL(p);

		for (i = index; i < p->header.nextindex; i++) {
		if (stbl[i] < 0 \|\| stbl[i] > 127) {
		jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld",
		i, stbl[i], (long)ip->i_ino, (long long)bn);
		free_page(dirent_buf);
		DT_PUTPAGE(mp);
		return -EIO;
		}

		d = (struct ldtentry *) & p->slot[stbl[i]];

		if (((long) jfs_dirent + d->namlen + 1) >