summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGhanshyam Agrawal <ghanshyam1898@gmail.com>2024-10-01 11:35:47 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-14 19:44:52 +0100
commitb62f41aeec9d250144c53875b507c1d45ae8c8fc (patch)
treec15f91bad796c6bfb4488ebdd0ecca71e80dcfd6 /fs
parentbbb24ce7f06ef9b7c05beb9340787cbe9fd3d08e (diff)
downloadlinux-b62f41aeec9d250144c53875b507c1d45ae8c8fc.tar.gz
linux-b62f41aeec9d250144c53875b507c1d45ae8c8fc.tar.bz2
linux-b62f41aeec9d250144c53875b507c1d45ae8c8fc.zip
jfs: fix array-index-out-of-bounds in jfs_readdir
[ Upstream commit 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: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/jfs/jfs_dtree.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index bd198b04c388..4692c50d615f 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -3187,6 +3187,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) >