diff options
author | Matthew Jordan <mjordan@digium.com> | 2015-03-04 18:55:08 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2015-03-04 18:55:08 +0000 |
commit | 41ba8fd7c07317f296af924be840f8b758fd138b (patch) | |
tree | 5a927935acbe5aca07aa9a72888e35164a9e005e | |
parent | 278ea2f468145a6a187743882c39241a999691e5 (diff) |
translate: Prevent invalid memory accesses on fast shutdown
When a 'core restart now' or 'core stop now' is executed and a channel is
currently in a media operation, the translator matrix can be destroyed while a
channel is currently blocked on getting the best translation choice
(see ast_translator_best_choice). When the channel gets the mutex, the
translation matrix now has invalid memory, and Asterisk crashes.
This patch does two things:
(1) We now only clean up the translation matrix on a graceful shutdown. In that
case, there are no channels, and so there is no risk of this occurring.
(2) We also now set the __matrix and __indextable to NULL. In some initial
backtraces when this occurred, it looked as if there was a memory corruption
occurring, and it wasn't until we determined that something had restarted
Asterisk that the issue became clear. By setting these to NULL on shutdown,
it becomes a bit easier to determine why a crash is occurring.
Note that we could litter the code with NULL checks on the __matrix, but the
act of making the translation matrix cleaned up on shutdown should preclude
this issue from occurring in the first place, and this part of the code needs
to be as fast as possible.
Review: https://reviewboard.asterisk.org/r/4457/
........
Merged revisions 432453 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/translate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/translate.c b/main/translate.c index 72abb59eb..bb07d50ab 100644 --- a/main/translate.c +++ b/main/translate.c @@ -1484,7 +1484,9 @@ static void translate_shutdown(void) ast_free(__matrix[x]); } ast_free(__matrix); + __matrix = NULL; ast_free(__indextable); + __indextable = NULL; ast_rwlock_unlock(&tablelock); ast_rwlock_destroy(&tablelock); } @@ -1495,6 +1497,6 @@ int ast_translate_init(void) ast_rwlock_init(&tablelock); res = matrix_resize(1); res |= ast_cli_register_multiple(cli_translate, ARRAY_LEN(cli_translate)); - ast_register_atexit(translate_shutdown); + ast_register_cleanup(translate_shutdown); return res; } |