]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ocfs2: relax BUG() to ocfs2_error() in __ocfs2_move_extent()
authorDmitry Antipov <dmantipov@yandex.ru>
Thu, 9 Oct 2025 10:23:49 +0000 (13:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Dec 2025 13:02:58 +0000 (14:02 +0100)
[ Upstream commit 8a7d58845fae061c62b50bc5eeb9bae4a1dedc3d ]

In '__ocfs2_move_extent()', relax 'BUG()' to 'ocfs2_error()' just
to avoid crashing the whole kernel due to a filesystem corruption.

Fixes: 8f603e567aa7 ("Ocfs2/move_extents: move a range of extent.")
Link: https://lkml.kernel.org/r/20251009102349.181126-2-dmantipov@yandex.ru
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Closes: https://syzkaller.appspot.com/bug?extid=727d161855d11d81e411
Reported-by: syzbot+727d161855d11d81e411@syzkaller.appspotmail.com
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ocfs2/move_extents.c

index 10923bf7c8b8416a9acf44bb8df3fecb29823079..26e150c5f25eb0058e84243ce6fc1b525ac54661 100644 (file)
@@ -98,7 +98,13 @@ static int __ocfs2_move_extent(handle_t *handle,
 
        rec = &el->l_recs[index];
 
-       BUG_ON(ext_flags != rec->e_flags);
+       if (ext_flags != rec->e_flags) {
+               ret = ocfs2_error(inode->i_sb,
+                                 "Inode %llu has corrupted extent %d with flags 0x%x at cpos %u\n",
+                                 (unsigned long long)ino, index, rec->e_flags, cpos);
+               goto out;
+       }
+
        /*
         * after moving/defraging to new location, the extent is not going
         * to be refcounted anymore.