[SRU][N][PATCH 1/1] jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree
Massimiliano Pellizzer
massimiliano.pellizzer at canonical.com
Fri Feb 28 07:51:45 UTC 2025
From: Nihar Chaithanya <niharchaithanya at gmail.com>
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 at syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=412dea214d8baa3f7483
Tested-by: syzbot+412dea214d8baa3f7483 at syzkaller.appspotmail.com
Signed-off-by: Nihar Chaithanya <niharchaithanya at gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp at oracle.com>
(cherry picked from commit a174706ba4dad895c40b1d2277bade16dfacdcd9)
CVE-2024-56595
Signed-off-by: Massimiliano Pellizzer <massimiliano.pellizzer at canonical.com>
---
fs/jfs/jfs_dmap.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 974ecf5e0d95..644f76f8d372 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -2888,6 +2888,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).
*/
--
2.43.0
More information about the kernel-team
mailing list