Unverified Commit fc1d9b69 authored Jan 06, 2025 by openeuler-ci-bot Committed by Gitee Jan 06, 2025

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GU7W6UW6QREOTCJPQDOTO5X5FXVFGCLO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAOO 
 
Link:https://gitee.com/openeuler/kernel/pulls/14472

 

Reviewed-by: Zhang Peng <zhangpeng362@huawei.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents 0cdb32a7 6a5f73f5

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) >