summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2017-02-04 23:14:19 -0500
committerTheodore Ts'o <tytso@mit.edu>2017-02-04 23:14:19 -0500
commite112666b4959b25a8552d63bc564e1059be703e8 (patch)
tree0815f739be05fff94ece280e2f4d9fc1a737ff08 /fs/jbd2
parenteb5efbcb762aee4b454b04f7115f73ccbcf8f0ef (diff)
downloadlinux-stable-e112666b4959b25a8552d63bc564e1059be703e8.tar.gz
linux-stable-e112666b4959b25a8552d63bc564e1059be703e8.tar.bz2
linux-stable-e112666b4959b25a8552d63bc564e1059be703e8.zip
jbd2: don't leak modified metadata buffers on an aborted journal
If the journal has been aborted, we shouldn't mark the underlying buffer head as dirty, since that will cause the metadata block to get modified. And if the journal has been aborted, we shouldn't allow this since it will almost certainly lead to a corrupted file system. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/transaction.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index e1652665bd93..5e659ee08d6a 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1863,7 +1863,9 @@ static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh)
__blist_del_buffer(list, jh);
jh->b_jlist = BJ_None;
- if (test_clear_buffer_jbddirty(bh))
+ if (transaction && is_journal_aborted(transaction->t_journal))
+ clear_buffer_jbddirty(bh);
+ else if (test_clear_buffer_jbddirty(bh))
mark_buffer_dirty(bh); /* Expose it to the VM */
}