Patch "jbd2: don't leak modified metadata buffers on an aborted journal" has been added to the 4.9-stable tree

Patch "jbd2: don't leak modified metadata buffers on an aborted journal" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    jbd2: don't leak modified metadata buffers on an aborted journal

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     jbd2-don-t-leak-modified-metadata-buffers-on-an-aborted-journal.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From e112666b4959b25a8552d63bc564e1059be703e8 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 4 Feb 2017 23:14:19 -0500
Subject: jbd2: don't leak modified metadata buffers on an aborted journal

From: Theodore Ts'o <tytso@mit.edu>

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/jbd2/transaction.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1863,7 +1863,9 @@ static void __jbd2_journal_temp_unlink_b
 
 	__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 */
 }
 


Patches currently in stable-queue which might be from tytso@mit.edu are

queue-4.9/ext4-fix-data-corruption-in-data-journal-mode.patch
queue-4.9/ext4-fix-use-after-iput-when-fscrypt-contexts-are-inconsistent.patch
queue-4.9/ext4-return-erofs-if-device-is-r-o-and-journal-replay-is-needed.patch
queue-4.9/ext4-include-forgotten-start-block-on-fallocate-insert-range.patch
queue-4.9/ext4-preserve-the-needs_recovery-flag-when-the-journal-is-aborted.patch
queue-4.9/ext4-fix-deadlock-between-inline_data-and-ext4_expand_extra_isize_ea.patch
queue-4.9/ext4-trim-allocation-requests-to-group-size.patch
queue-4.9/ext4-do-not-polute-the-extents-cache-while-shifting-extents.patch
queue-4.9/ext4-fix-inline-data-error-paths.patch
queue-4.9/jbd2-don-t-leak-modified-metadata-buffers-on-an-aborted-journal.patch