Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2569260 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: set h_journal if there is a failure starting a reserved handle 



If ext4 tries to start a reserved handle via
jbd2_journal_start_reserved(), and the journal has been aborted, this
can result in a NULL pointer dereference.  This is because the fields
h_journal and h_transaction in the handle structure share the same
memory, via a union, so jbd2_journal_start_reserved() will clear
h_journal before calling start_this_handle().  If this function fails
due to an aborted handle, h_journal will still be NULL, and the call
to jbd2_journal_free_reserved() will pass a NULL journal to
sub_reserve_credits().

This can be reproduced by running "kvm-xfstests -c dioread_nolock
generic/475".

Cc: stable@kernel.org # 3.11
Fixes: 8f7d89f3 ("jbd2: transaction reservation support")
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 349fa7d6

fs/jbd2/transaction.c

+1 −0
Original line number Diff line number Diff line
@@ -532,6 +532,7 @@ int jbd2_journal_start_reserved(handle_t *handle, unsigned int type, 
	 */

	ret = start_this_handle(journal, handle, GFP_NOFS);

	if (ret < 0) {

		handle->h_journal = journal;

		jbd2_journal_free_reserved(handle);

		return ret;

	}