]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
jfs: validate max amount of blocks before allocation.
authorAlexei Filippov <halip0503@gmail.com>
Sat, 19 Aug 2023 17:32:16 +0000 (20:32 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:46:57 +0000 (10:46 +0200)
[ Upstream commit 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 ]

The lack of checking bmp->db_max_freebud in extBalloc() can lead to
shift out of bounds, so this patch prevents undefined behavior, because
bmp->db_max_freebud == -1 only if there is no free space.

Signed-off-by: Aleksei Filippov <halip0503@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-and-tested-by: syzbot+5f088f29593e6b4c8db8@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?id=01abadbd6ae6a08b1f1987aa61554c6b3ac19ff2
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/jfs/jfs_extent.c

index 2ae7d59ab10a595120b7a3a124e3e19fe408841d..c971e8a6525dea71b702a59c979afad376c6f7f7 100644 (file)
@@ -521,6 +521,11 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
         * blocks in the map. in that case, we'll start off with the
         * maximum free.
         */
+
+       /* give up if no space left */
+       if (bmp->db_maxfreebud == -1)
+               return -ENOSPC;
+
        max = (s64) 1 << bmp->db_maxfreebud;
        if (*nblocks >= max && *nblocks > nbperpage)
                nb = nblks = (max > nbperpage) ? max : nbperpage;