Skip to contentSkip to conversation

jfs: fix null ptr deref in dtInsertEntry

PATCH New Sasha Levin 1 participant 2 messages Jul 30, 2024 Stable branch

lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

PATCH 1/2 jfs: fix null ptr deref in dtInsertEntry

From: Edward Adam Davis <[email protected]>

[ Upstream commit ce6dede912f064a855acf6f04a04cbb2c25b8c8c ]

[syzbot reported]

general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN PTI
KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f]
CPU: 0 PID: 5061 Comm: syz-executor404 Not tainted 6.8.0-syzkaller-08951-gfe46a7dd189e #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
RIP: 0010:dtInsertEntry+0xd0c/0x1780 fs/jfs/jfs_dtree.c:3713

...
[Analyze]
In dtInsertEntry(), when the pointer h has the same value as p, after writing name in UniStrncpy_to_le(), p->header.flag will be cleared. This will cause the previously true judgment "p->header.flag & BT-LEAF" to change to no after writing the name operation, this leads to entering an incorrect branch and accessing the uninitialized object ih when judging this condition for the second time.

[Fix]
After got the page, check freelist first, if freelist == 0 then exit dtInsert() and return -EINVAL.

---
 fs/jfs/jfs_dtree.c | 2 ++
 1 file changed, 2 insertions(+)
fs/jfs/jfs_dtree.c +2 -0
index ea2c8f0fe832c..0c16f7f8eaa2b 100644
@@ -847,6 +847,8 @@ int dtInsert(tid_t tid, struct inode *ip,
 	 * the full page.
 	 */
 	DT_GETSEARCH(ip, btstack->top, bn, mp, p, index);
+	if (p->header.freelist == 0)
+		return -EINVAL;
 
 	/*
 	 *	insert entry for new key
Signature · 1 line
2.43.0
author maintainer
#1 lore raw

PATCH 2/2 jfs: Fix shift-out-of-bounds in dbDiscardAG

From: Pei Li <[email protected]>

[ Upstream commit 7063b80268e2593e58bee8a8d709c2f3ff93e2f2 ]

When searching for the next smaller log2 block, BLKSTOL2() returned 0, causing shift exponent -1 to be negative.

This patch fixes the issue by exiting the loop directly when negative shift is found.

---
 fs/jfs/jfs_dmap.c | 2 ++
 1 file changed, 2 insertions(+)
fs/jfs/jfs_dmap.c +2 -0
index 893bc59658dad..672471f4e72c8 100644
@@ -1707,6 +1707,8 @@ s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)
 		} else if (rc == -ENOSPC) {
 			/* search for next smaller log2 block */
 			l2nb = BLKSTOL2(nblocks) - 1;
+			if (unlikely(l2nb < 0))
+				break;
 			nblocks = 1LL << l2nb;
 		} else {
 			/* Trim any already allocated blocks */
Signature · 1 line
2.43.0