summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManas Ghandat <ghandatmanas@gmail.com>2023-10-25 11:39:07 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-05 20:14:15 +0000
commit7110650b85dd2f1cee819acd1345a9013a1a62f7 (patch)
tree8850731f06804bc247b093dc225e36bc353f6f6e
parentedff092a59260bf0b0a2eba219cb3da6372c2f9f (diff)
downloadlinux-stable-7110650b85dd2f1cee819acd1345a9013a1a62f7.tar.gz
linux-stable-7110650b85dd2f1cee819acd1345a9013a1a62f7.tar.bz2
linux-stable-7110650b85dd2f1cee819acd1345a9013a1a62f7.zip
jfs: fix slab-out-of-bounds Read in dtSearch
[ Upstream commit fa5492ee89463a7590a1449358002ff7ef63529f ] Currently while searching for current page in the sorted entry table of the page there is a out of bound access. Added a bound check to fix the error. Dave: Set return code to -EIO Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202310241724.Ed02yUz9-lkp@intel.com/ Signed-off-by: Manas Ghandat <ghandatmanas@gmail.com> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/jfs/jfs_dtree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index f3d3e8b3f50c..031d8f570f58 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -633,6 +633,11 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
for (base = 0, lim = p->header.nextindex; lim; lim >>= 1) {
index = base + (lim >> 1);
+ if (stbl[index] < 0) {
+ rc = -EIO;
+ goto out;
+ }
+
if (p->header.flag & BT_LEAF) {
/* uppercase leaf name to compare */
cmp =