linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

jbd2: gracefully abort on checkpointing state corruptions

Browse Source 
This patch targets two internal state machine invariants in checkpoint.c
residing inside functions that natively return integer error codes.

- In jbd2_cleanup_journal_tail(): A blocknr of 0 indicates a severely
corrupted journal superblock. Replaced the J_ASSERT with a WARN_ON_ONCE
and a graceful journal abort, returning -EFSCORRUPTED.

- In jbd2_log_do_checkpoint(): Replaced the J_ASSERT_BH checking for
an unexpected buffer_jwrite state. If the warning triggers, we
explicitly drop the just-taken get_bh() reference and call __flush_batch()
to safely clean up any previously queued buffers in the j_chkpt_bhs array,
preventing a memory leak before returning -EFSCORRUPTED.

Signed-off-by: Milos Nikic <nikic.milos@gmail.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Baokun Li <libaokun@linux.alibaba.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20260311041548.159424-1-nikic.milos@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
This commit is contained in:
Milos Nikic
2026-03-27 23:34:09 -04:00
committed by Theodore Ts'o
parent 5422fe71d2
commit bac3190a8e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/jbd2/checkpoint.c
+13 -2
View File
@@ -267,7 +267,15 @@ restart:
*/
BUFFER_TRACE(bh, "queue");
get_bh(bh);
J_ASSERT_BH(bh, !buffer_jwrite(bh));
if (WARN_ON_ONCE(buffer_jwrite(bh))) {
put_bh(bh); /* drop the ref we just took */
spin_unlock(&journal->j_list_lock);
/* Clean up any previously batched buffers */
if (batch_count)
__flush_batch(journal, &batch_count);
jbd2_journal_abort(journal, -EFSCORRUPTED);
return -EFSCORRUPTED;
}
journal->j_chkpt_bhs[batch_count++] = bh;
transaction->t_chp_stats.cs_written++;
transaction->t_checkpoint_list = jh->b_cpnext;
@@ -325,7 +333,10 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
if (!jbd2_journal_get_log_tail(journal, &first_tid, &blocknr))
return 1;
J_ASSERT(blocknr != 0);
if (WARN_ON_ONCE(blocknr == 0)) {
jbd2_journal_abort(journal, -EFSCORRUPTED);
return -EFSCORRUPTED;
}
/*
* We need to make sure that any blocks that were recently written out