diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 18:55:07 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 18:55:07 +0000 |
| commit | 08e4186588bc3bba827ee81d39c165c04be10f04 (patch) | |
| tree | 9ac0bc353a9464b9d44e5ed401129e674b1763d7 /main | |
| parent | 656f024b5fc2e5105c0f40f15ea555393f477be8 (diff) | |
Merged revisions 187483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r187483 | tilghman | 2009-04-09 13:40:01 -0500 (Thu, 09 Apr 2009) | 15 lines
Merged revisions 187428 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r187428 | tilghman | 2009-04-09 13:08:20 -0500 (Thu, 09 Apr 2009) | 8 lines
Race condition between ast_cli_command() and 'module unload' could cause a deadlock.
Add lock timeouts to avoid this potential deadlock.
(closes issue #14705)
Reported by: jamessan
Patches:
20090320__bug14705.diff.txt uploaded by tilghman (license 14)
Tested by: jamessan
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@187487 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/main/manager.c b/main/manager.c index 6869274ab..0773dde5c 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3350,8 +3350,12 @@ int __manager_event(int category, const char *event, int ast_manager_unregister(char *action) { struct manager_action *cur; + struct timespec tv = { 5, }; - AST_RWLIST_WRLOCK(&actions); + if (AST_RWLIST_TIMEDWRLOCK(&actions, &tv)) { + ast_log(LOG_ERROR, "Could not obtain lock on manager list\n"); + return -1; + } AST_RWLIST_TRAVERSE_SAFE_BEGIN(&actions, cur, list) { if (!strcasecmp(action, cur->action)) { AST_RWLIST_REMOVE_CURRENT(list); @@ -3360,7 +3364,7 @@ int ast_manager_unregister(char *action) break; } } - AST_RWLIST_TRAVERSE_SAFE_END; + AST_RWLIST_TRAVERSE_SAFE_END AST_RWLIST_UNLOCK(&actions); return 0; @@ -3379,8 +3383,12 @@ static int manager_state_cb(char *context, char *exten, int state, void *data) static int ast_manager_register_struct(struct manager_action *act) { struct manager_action *cur, *prev = NULL; + struct timespec tv = { 5, }; - AST_RWLIST_WRLOCK(&actions); + if (AST_RWLIST_TIMEDWRLOCK(&actions, &tv)) { + ast_log(LOG_ERROR, "Could not obtain lock on manager list\n"); + return -1; + } AST_RWLIST_TRAVERSE(&actions, cur, list) { int ret = strcasecmp(cur->action, act->action); if (ret == 0) { @@ -3393,8 +3401,8 @@ static int ast_manager_register_struct(struct manager_action *act) break; } } - - if (prev) + + if (prev) AST_RWLIST_INSERT_AFTER(&actions, prev, act, list); else AST_RWLIST_INSERT_HEAD(&actions, act, list); @@ -3421,7 +3429,10 @@ int ast_manager_register2(const char *action, int auth, int (*func)(struct manse cur->synopsis = synopsis; cur->description = description; - ast_manager_register_struct(cur); + if (ast_manager_register_struct(cur)) { + ast_free(cur); + return -1; + } return 0; } |