Merge "jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()"

This commit is contained in:
Linux Build Service Account 2014-01-10 01:28:38 -08:00 committed by Gerrit - the friendly Code Review server
commit c5480adbde
1 changed files with 4 additions and 4 deletions

View File

@ -219,10 +219,10 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
set_buffer_prio(bh);
if (ext4_handle_valid(handle)) {
err = jbd2_journal_dirty_metadata(handle, bh);
if (err) {
/* Errors can only happen if there is a bug */
handle->h_err = err;
__ext4_journal_stop(where, line, handle);
/* Errors can only happen if there is a bug */
if (WARN_ON_ONCE(err)) {
ext4_journal_abort_handle(where, line, __func__, bh,
handle, err);
}
} else {
if (inode)