]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
jfs: fix shift-out-of-bounds in dbSplit
authorGhanshyam Agrawal <ghanshyam1898@gmail.com>
Mon, 30 Sep 2024 08:12:18 +0000 (13:42 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:54:43 +0000 (19:54 +0100)
[ Upstream commit a5f5e4698f8abbb25fe4959814093fb5bfa1aa9d ]

When dmt_budmin is less than zero, it causes errors
in the later stages. Added a check to return an error beforehand
in dbAllocCtl itself.

Reported-by: syzbot+b5ca8a249162c4b9a7d0@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=b5ca8a249162c4b9a7d0
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>
fs/jfs/jfs_dmap.c

index a6b1d748df16bb548ecf1fef658952f64be1ea36..30a56c37d9ecf5fff906f192db5d58d97792200d 100644 (file)
@@ -1820,6 +1820,9 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)
                        return -EIO;
                dp = (struct dmap *) mp->data;
 
+               if (dp->tree.budmin < 0)
+                       return -EIO;
+
                /* try to allocate the blocks.
                 */
                rc = dbAllocDmapLev(bmp, dp, (int) nblocks, l2nb, results);