sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chan_pjsip.c: Check for channel and session to not be NULL in hangup 

We have seen some rare case of segmentation fault in hangup function
and we could notice that channel pointer was NULL.  Debug log shows
that there is a 200 OK answer and SIP timeout at the same time.  It
looks that while the SIP session was being destroyed due to timeout
call hangup due to answer event lead to race condition and channel
is being destroyed from two different places.  The check ensures we
check it not to be NULL before freeing it.

ASTERISK-25371

Change-Id: I19f6566830640625e08f7b87bfe15758ad33a778
This commit is contained in:
agupta 2019-06-06 18:18:18 +05:30 committed by Sean Bright
parent de38c9c3b3
commit 72f26aa8eb
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
channels/chan_pjsip.c
View File

@ -2342,18 +2342,27 @@ static int hangup(void *data)
struct hangup_data *h_data = data;
struct ast_channel *ast = h_data->chan;
struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(ast);
struct ast_sip_session *session = channel->session;
int cause = h_data->cause;
/*
* It's possible that session_terminate might cause the session to be destroyed
* immediately so we need to keep a reference to it so we can NULL session->channel
* afterwards.
* Before cleaning we have to ensure that channel or its session is not NULL
* we have seen rare case when taskprocessor calls hangup but channel is NULL
* due to SIP session timeout and answer happening at the same time
*/
ast_sip_session_terminate(ao2_bump(session), cause);
clear_session_and_channel(session, ast);
ao2_cleanup(session);
ao2_cleanup(channel);
if (channel) {
struct ast_sip_session *session = channel->session;
if (session) {
int cause = h_data->cause;
/*
* It's possible that session_terminate might cause the session to be destroyed
* immediately so we need to keep a reference to it so we can NULL session->channel
* afterwards.
*/
ast_sip_session_terminate(ao2_bump(session), cause);
clear_session_and_channel(session, ast);
ao2_cleanup(session);
}
ao2_cleanup(channel);
}
ao2_cleanup(h_data);
return 0;
}