diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-05 20:53:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-05 20:53:36 -0800 |
| commit | dd09cbba262e6a13856385e52bded069d78408bd (patch) | |
| tree | 9611b3fcde894624a3be4f478cd2f90f0c207c90 | |
| parent | 8233655f50e17933c676c9cbadf6e93858ebeaec (diff) | |
| parent | cd899455944cf33d6adf0fea3be84f70e04a800c (diff) | |
Merge "jbd2: Fix use after free in kjournald2()"
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 624a57a9c4aa..c6a499b7547e 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -275,11 +275,11 @@ loop: goto loop; end_loop: - write_unlock(&journal->j_state_lock); del_timer_sync(&journal->j_commit_timer); journal->j_task = NULL; wake_up(&journal->j_wait_done_commit); jbd_debug(1, "Journal thread exiting.\n"); + write_unlock(&journal->j_state_lock); return 0; } |