kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge: Unlock channel during Local peer check.

Browse Source 
It's not safe to keep the channel locked while locking
the peer Local channel, as it can result in a deadlock.

This change unlocks it during this time but keeps the
bridge locked to ensure nothing changes about the bridge.

ASTERISK-29821

Change-Id: Ib68eb7037e5a479bcc2aceee77337cdde1fbdde6
(cherry picked from commit d83a46869e)
This commit is contained in:
Joshua C. Colp
2021-12-27 09:28:00 -04:00
committed by Joshua Colp
parent 85601849c6
commit c1129fdd8c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/bridge_channel.c
View File

@@ -2877,11 +2877,13 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
ast_bridge_lock(bridge_channel->bridge); ast_bridge_lock(bridge_channel->bridge);
ast_channel_lock(bridge_channel->chan); ast_channel_lock(bridge_channel->chan);
peer = ast_local_get_peer(bridge_channel->chan); peer = ast_local_get_peer(bridge_channel->chan);
if (peer) { if (peer) {
struct ast_bridge *peer_bridge; struct ast_bridge *peer_bridge;
ast_channel_unlock(bridge_channel->chan);
ast_channel_lock(peer); ast_channel_lock(peer);
peer_bridge = ast_channel_internal_bridge(peer); peer_bridge = ast_channel_internal_bridge(peer);
ast_channel_unlock(peer); ast_channel_unlock(peer);
@@ -2891,7 +2893,6 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
* to be reference counted or locked. * to be reference counted or locked.
*/ */
if (peer_bridge == bridge_channel->bridge) { if (peer_bridge == bridge_channel->bridge) {
ast_channel_unlock(bridge_channel->chan);
ast_bridge_unlock(bridge_channel->bridge); ast_bridge_unlock(bridge_channel->bridge);
ast_debug(1, "Bridge %s: %p(%s) denying Bridge join to prevent Local channel loop\n", ast_debug(1, "Bridge %s: %p(%s) denying Bridge join to prevent Local channel loop\n",
bridge_channel->bridge->uniqueid, bridge_channel->bridge->uniqueid,
@@ -2899,6 +2900,8 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
ast_channel_name(bridge_channel->chan)); ast_channel_name(bridge_channel->chan));
return -1; return -1;
} }
ast_channel_lock(bridge_channel->chan);
} }
bridge_channel->read_format = ao2_bump(ast_channel_readformat(bridge_channel->chan)); bridge_channel->read_format = ao2_bump(ast_channel_readformat(bridge_channel->chan));