rtp_engine: fix crash during remote native bridging when calling get_codecs

When two RTP channels are in a remote bridge, the remote bridging loop in
rtp_engine will periodically check to see if the two channels can still be
bridged. One of the many things it checks is whether or not the codecs have
changed on the channel. If the codec has changed, it will break out of the
loop to re-determine which type of bridge is appropriate.

In order to perform this check, the ast_rtp_glue virtual table's get_codec
callback is called for each channel. The callback implementations assume
that the channel tech private is valid when called; as such, there has
always been some code in place to check whether or not the channel pvt is
NULL before calling. However, this check is insufficient.

The channels are unlocked during the remote bridging loop. It is possible
for a channel to get masqueraded between the check for the pvt being NULL and
the actual call to get_codec. When this occurs, the callback is called with a
ZOMBIE channel, which now has a NULL pvt. Crash.

While this has always been possible in Asterisk 1.8, it is much more likely to
occur in Asterisk 11 and later versions due to the timing changes that occur
when getting the codec from a channel. Note that this is much more likely to be
reproduced on slow, boggy hardware running Asterisk 11 - but fairly rarely
otherwise.

Also Note: This crash was also caught by the various SIP blind transfer tests,
in addition to the bug report Alec filed.

Review: https://reviewboard.asterisk.org/r/3247/

(closes issue ASTERISK-21737)
Reported by: Alec Davis
Tested by: Alec Davis



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@409001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-02-27 12:39:34 +00:00
parent d72f70e9a5
commit bb9dfa1962
2 changed files with 15 additions and 3 deletions

View File

@@ -412,7 +412,9 @@ struct ast_rtp_glue {
enum ast_rtp_glue_result (*get_trtp_info)(struct ast_channel *chan, struct ast_rtp_instance **instance); enum ast_rtp_glue_result (*get_trtp_info)(struct ast_channel *chan, struct ast_rtp_instance **instance);
/*! Callback for updating the destination that the remote side should send RTP to */ /*! Callback for updating the destination that the remote side should send RTP to */
int (*update_peer)(struct ast_channel *chan, struct ast_rtp_instance *instance, struct ast_rtp_instance *vinstance, struct ast_rtp_instance *tinstance, format_t codecs, int nat_active); int (*update_peer)(struct ast_channel *chan, struct ast_rtp_instance *instance, struct ast_rtp_instance *vinstance, struct ast_rtp_instance *tinstance, format_t codecs, int nat_active);
/*! Callback for retrieving codecs that the channel can do */ /*! Callback for retrieving codecs that the channel can do
* \note chan will be locked when this function is called
*/
format_t (*get_codec)(struct ast_channel *chan); format_t (*get_codec)(struct ast_channel *chan);
/*! Linked list information */ /*! Linked list information */
AST_RWLIST_ENTRY(ast_rtp_glue) entry; AST_RWLIST_ENTRY(ast_rtp_glue) entry;

View File

@@ -1051,9 +1051,11 @@ static enum ast_bridge_result remote_bridge_loop(struct ast_channel *c0, struct
if (tinstance1) { if (tinstance1) {
ast_rtp_instance_get_remote_address(tinstance1, &tt1); ast_rtp_instance_get_remote_address(tinstance1, &tt1);
} }
if (glue1->get_codec) { ast_channel_lock(c1);
if (glue1->get_codec && c1->tech_pvt) {
codec1 = glue1->get_codec(c1); codec1 = glue1->get_codec(c1);
} }
ast_channel_unlock(c1);
ast_rtp_instance_get_remote_address(instance0, &t0); ast_rtp_instance_get_remote_address(instance0, &t0);
if (vinstance0) { if (vinstance0) {
@@ -1062,9 +1064,11 @@ static enum ast_bridge_result remote_bridge_loop(struct ast_channel *c0, struct
if (tinstance0) { if (tinstance0) {
ast_rtp_instance_get_remote_address(tinstance0, &tt0); ast_rtp_instance_get_remote_address(tinstance0, &tt0);
} }
if (glue0->get_codec) { ast_channel_lock(c0);
if (glue0->get_codec && c0->tech_pvt) {
codec0 = glue0->get_codec(c0); codec0 = glue0->get_codec(c0);
} }
ast_channel_unlock(c0);
if ((ast_sockaddr_cmp(&t1, &ac1)) || if ((ast_sockaddr_cmp(&t1, &ac1)) ||
(vinstance1 && ast_sockaddr_cmp(&vt1, &vac1)) || (vinstance1 && ast_sockaddr_cmp(&vt1, &vac1)) ||
@@ -1175,13 +1179,19 @@ static enum ast_bridge_result remote_bridge_loop(struct ast_channel *c0, struct
ast_sockaddr_copy(&ac0, &t0); ast_sockaddr_copy(&ac0, &t0);
ast_rtp_instance_get_remote_address(instance1, &t1); ast_rtp_instance_get_remote_address(instance1, &t1);
ast_sockaddr_copy(&ac1, &t1); ast_sockaddr_copy(&ac1, &t1);
/* Update codec information */ /* Update codec information */
ast_channel_lock(c0);
if (glue0->get_codec && c0->tech_pvt) { if (glue0->get_codec && c0->tech_pvt) {
oldcodec0 = codec0 = glue0->get_codec(c0); oldcodec0 = codec0 = glue0->get_codec(c0);
} }
ast_channel_unlock(c0);
ast_channel_lock(c1);
if (glue1->get_codec && c1->tech_pvt) { if (glue1->get_codec && c1->tech_pvt) {
oldcodec1 = codec1 = glue1->get_codec(c1); oldcodec1 = codec1 = glue1->get_codec(c1);
} }
ast_channel_unlock(c1);
/* Since UPDATE_BRIDGE_PEER is only used by the bridging code, don't forward it */ /* Since UPDATE_BRIDGE_PEER is only used by the bridging code, don't forward it */
if (fr->subclass.integer != AST_CONTROL_UPDATE_RTP_PEER) { if (fr->subclass.integer != AST_CONTROL_UPDATE_RTP_PEER) {
ast_indicate_data(other, fr->subclass.integer, fr->data.ptr, fr->datalen); ast_indicate_data(other, fr->subclass.integer, fr->data.ptr, fr->datalen);