]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree
authorNihar Chaithanya <niharchaithanya@gmail.com>
Tue, 8 Oct 2024 20:21:38 +0000 (01:51 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:51:39 +0000 (19:51 +0100)
[ Upstream commit a174706ba4dad895c40b1d2277bade16dfacdcd9 ]

When the value of lp is 0 at the beginning of the for loop, it will
become negative in the next assignment and we should bail out.

Reported-by: syzbot+412dea214d8baa3f7483@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=412dea214d8baa3f7483
Tested-by: syzbot+412dea214d8baa3f7483@syzkaller.appspotmail.com
Signed-off-by: Nihar Chaithanya <niharchaithanya@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 7486c79a5058b0369fcc5b46c172b282ca674334..e6cbe4c982c58fc597d98b30ce48bcff6ce6ebba 100644 (file)
@@ -2957,6 +2957,9 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl)
        /* bubble the new value up the tree as required.
         */
        for (k = 0; k < le32_to_cpu(tp->dmt_height); k++) {
+               if (lp == 0)
+                       break;
+
                /* get the index of the first leaf of the 4 leaf
                 * group containing the specified leaf (leafno).
                 */