]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
ext4: set h_journal if there is a failure starting a reserved handle
authorTheodore Ts'o <tytso@mit.edu>
Wed, 18 Apr 2018 15:49:31 +0000 (11:49 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 14 Aug 2018 10:23:25 +0000 (12:23 +0200)
commitf0177bd8f4c22af998d07c7a17dea224cb2daf87
tree01fc6de07a1c17b66f04de4388d6c44d707906da
parentc5330b8a314b4d0b7b1c0686896c6f288f3df7dd
ext4: set h_journal if there is a failure starting a reserved handle

BugLink: http://bugs.launchpad.net/bugs/1778265
commit b2569260d55228b617bd82aba6d0db2faeeb4116 upstream.

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: 8f7d89f36829b ("jbd2: transaction reservation support")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/jbd2/transaction.c