diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2015-10-17 22:57:06 -0400 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-12-31 01:44:57 +0100 |
| commit | 19c5c39c8147bdba0b662df8df9cc7bbc35df07e (patch) | |
| tree | 8d1f8302bf7159989386a193e9315eddcc161258 /fs/ext4 | |
| parent | c31ae88de60ef821b3011cac07d468a6d4e24e2c (diff) | |
UPSTREAM: ext4: fix potential use after free in __ext4_journal_stop
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
9705acd63b125dee8b15c705216d7186daea4625 and it is wrong. Fix it by
storing the handle->h_err value beforehand and avoid referencing
potentially freed handle.
Fixes: 9705acd63b125dee8b15c705216d7186daea4625
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Cc: stable@vger.kernel.org
(cherry picked from commit 6934da9238da947628be83635e365df41064b09b)
Signed-off-by: Bernie Thompson <bhthompson@google.com>
Change-Id: I788135d7558d1c6ddcdef4366e106b17e9df80a5
Reviewed-on: https://chromium-review.googlesource.com/412985
Commit-Ready: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Signed-off-by: Joe Maples <joe@frap129.org>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index d41843181..e770c1ee4 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -88,13 +88,13 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle) return 0; } + err = handle->h_err; if (!handle->h_transaction) { - err = jbd2_journal_stop(handle); - return handle->h_err ? handle->h_err : err; + rc = jbd2_journal_stop(handle); + return err ? err : rc; } sb = handle->h_transaction->t_journal->j_private; - err = handle->h_err; rc = jbd2_journal_stop(handle); if (!err) |