Commit 13ea5f86 authored by Lukas Czerner's avatar Lukas Czerner Committed by Luis Henriques

ext4: fix potential use after free in __ext4_journal_stop

commit 6934da92 upstream.

There is a use-after-free possibility in __ext4_journal_stop() in the
case that we free the handle in the first jbd2_journal_stop() because
we're referencing handle->h_err afterwards. This was introduced in
9705acd6 and it is wrong. Fix it by
storing the handle->h_err value beforehand and avoid referencing
potentially freed handle.

Fixes: 9705acd6Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent c40009c4
...@@ -88,13 +88,13 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle) ...@@ -88,13 +88,13 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle)
return 0; return 0;
} }
err = handle->h_err;
if (!handle->h_transaction) { if (!handle->h_transaction) {
err = jbd2_journal_stop(handle); rc = jbd2_journal_stop(handle);
return handle->h_err ? handle->h_err : err; return err ? err : rc;
} }
sb = handle->h_transaction->t_journal->j_private; sb = handle->h_transaction->t_journal->j_private;
err = handle->h_err;
rc = jbd2_journal_stop(handle); rc = jbd2_journal_stop(handle);
if (!err) if (!err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment