diff options
| author | Kees Cook <keescook@chromium.org> | 2017-03-06 12:42:12 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-03-07 08:21:38 -0800 |
| commit | 6330d5534786d5315d56d558aa6d20740f97d80a (patch) | |
| tree | b081b7ec57184b7c5a9bffdfb64071f2cc234040 /fs/pstore | |
| parent | e9a330c4289f2ba1ca4bf98c2b430ab165a8931b (diff) | |
| download | linux-6330d5534786d5315d56d558aa6d20740f97d80a.tar.bz2 | |
pstore: Shut down worker when unregistering
When built as a module and running with update_ms >= 0, pstore will Oops
during module unload since the work timer is still running. This makes sure
the worker is stopped before unloading.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/pstore')
| -rw-r--r-- | fs/pstore/platform.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index cfc1abd264d9..074fe85a2078 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -709,6 +709,7 @@ int pstore_register(struct pstore_info *psi) if (psi->flags & PSTORE_FLAGS_PMSG) pstore_register_pmsg(); + /* Start watching for new records, if desired. */ if (pstore_update_ms >= 0) { pstore_timer.expires = jiffies + msecs_to_jiffies(pstore_update_ms); @@ -731,6 +732,11 @@ EXPORT_SYMBOL_GPL(pstore_register); void pstore_unregister(struct pstore_info *psi) { + /* Stop timer and make sure all work has finished. */ + pstore_update_ms = -1; + del_timer_sync(&pstore_timer); + flush_work(&pstore_work); + if (psi->flags & PSTORE_FLAGS_PMSG) pstore_unregister_pmsg(); if (psi->flags & PSTORE_FLAGS_FTRACE) @@ -830,7 +836,9 @@ static void pstore_timefunc(unsigned long dummy) schedule_work(&pstore_work); } - mod_timer(&pstore_timer, jiffies + msecs_to_jiffies(pstore_update_ms)); + if (pstore_update_ms >= 0) + mod_timer(&pstore_timer, + jiffies + msecs_to_jiffies(pstore_update_ms)); } module_param(backend, charp, 0444); |