diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-02-04 23:14:19 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:17:03 +0100 |
| commit | 38b812d435a34e65a37edf7bb5d20b7ebdfdcf3c (patch) | |
| tree | 2dae28a73680a51dc4f615284940c1fc12ea0b1c /fs | |
| parent | f5623c19f2928d78ad50fa13ac357106bb3d737a (diff) | |
| download | linux-stable-38b812d435a34e65a37edf7bb5d20b7ebdfdcf3c.tar.gz linux-stable-38b812d435a34e65a37edf7bb5d20b7ebdfdcf3c.tar.bz2 linux-stable-38b812d435a34e65a37edf7bb5d20b7ebdfdcf3c.zip | |
jbd2: don't leak modified metadata buffers on an aborted journal
commit e112666b4959b25a8552d63bc564e1059be703e8 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd2/transaction.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index f156390113db..3a5c29a5733d 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -1784,7 +1784,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 */ } |