ocfs2-validate-group-add-input-before-caching.patch removed from -mm tree
The quilt patch titled
Subject: ocfs2: validate group add input before caching
has been removed from the -mm tree. Its filename was
ocfs2-validate-group-add-input-before-caching.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: ZhengYuan Huang <[email protected]>
Subject: ocfs2: validate group add input before caching
Date: Fri, 10 Apr 2026 10:02:08 +0800
[BUG]OCFS2_IOC_GROUP_ADD can trigger a BUG_ON inocfs2_set_new_buffer_uptodate():
kernel BUG at fs/ocfs2/uptodate.c:509!
Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI RIP: 0010:ocfs2_set_new_buffer_uptodate+0x194/0x1e0 fs/ocfs2/uptodate.c:509 Code: ffffe88f 42b9fe4c 89e64889 dfe8b4df Call Trace: ocfs2_group_add+0x3f1/0x1510 fs/ocfs2/resize.c:507 ocfs2_ioctl+0x309/0x6e0 fs/ocfs2/ioctl.c:887 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl fs/ioctl.c:583 [inline] __x64_sys_ioctl+0x197/0x1e0 fs/ioctl.c:583 x64_sys_call+0x1144/0x26a0 arch/x86/include/generated/asm/syscalls_64.h:17 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x93/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7bbfb55a966d
[CAUSE]ocfs2_group_add() calls ocfs2_set_new_buffer_uptodate() on a user-controlled group block before ocfs2_verify_group_and_input() validates that block number. That helper is only valid for newly allocated metadata and asserts that the block is not already present in the chosen metadata cache. The code also uses INODE_CACHE(inode) even though the group descriptor belongs to main_bm_inode and later journal accesses use that cache context instead.
[FIX]
Validate the on-disk group descriptor before caching it, then add it to the metadata cache tracked by INODE_CACHE(main_bm_inode). Keep the validation failure path separate from the later cleanup path so we only remove the buffer from that cache after it has actually been inserted. This keeps the group buffer lifetime consistent across validation, journaling, and cleanup.
---
fs/ocfs2/resize.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/ocfs2/resize.c renamed from fs/ocfs2/resize.c~ocfs2-validate-group-add-input-before-caching +7 -5
@@ -508,14 +508,14 @@ int ocfs2_group_add(struct inode *inode, goto out_unlock; } -ocfs2_set_new_buffer_uptodate (INODE_CACHE (inode), group_bh); - ret =ocfs2_verify_group_and_input (main_bm_inode, fe, input, group_bh);if (ret) {mlog_errno (ret); goto out_free_group_bh; } +ocfs2_set_new_buffer_uptodate (INODE_CACHE (main_bm_inode), group_bh); +trace_ocfs2_group_add ((unsigned long long )input->group, input->chain, input->clusters, input->frees);
@@ -523,7 +523,7 @@ int ocfs2_group_add(struct inode *inode,if (IS_ERR (handle)) {mlog_errno (PTR_ERR (handle)); ret = -EINVAL ; - goto out_free_group_bh; + goto out_remove_cache; } cl_bpc =le16_to_cpu (fe->id2.i_chain.cl_bpc);
@@ -577,9 +577,11 @@ int ocfs2_group_add(struct inode *inode, out_commit:ocfs2_commit_trans (osb, handle); -out_free_group_bh: +out_remove_cache:if (ret <0 ) -ocfs2_remove_from_cache (INODE_CACHE (inode), group_bh); +ocfs2_remove_from_cache (INODE_CACHE (main_bm_inode), group_bh); + +out_free_group_bh:brelse (group_bh); out_unlock:
_
Patches currently in -mm which might be from [email protected] are