ast_framehook_detach() must be called with the channel locked.

The framehook container could become corrupted if the channel lock is not
held before calling.

Change-Id: If0a1c7ba0484ed3a191106a7516526b905952584

diff --git a/res/res_fax.c b/res/res_fax.c
index 86260d10e3f042ab18a500e3a0f80e246a88f243..be88b585ec5620faf5d9f334195aafea21d74ded 100644 (file)
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -4509,7 +4509,9 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
                                ast_log(LOG_WARNING, "Attempt to attach a T.38 gateway on channel (%s) with gateway already running.\n", ast_channel_name(chan));
                        }
                } else if (ast_false(val)) {
+                       ast_channel_lock(chan);
                        ast_framehook_detach(chan, details->gateway_id);
+                       ast_channel_unlock(chan);
                        details->gateway_id = -1;
                } else {
                        ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);
@@ -4561,7 +4563,9 @@ static int acf_faxopt_write(struct ast_channel *chan, const char *cmd, char *dat
                                ast_log(LOG_WARNING, "Attempt to attach a FAX detect on channel (%s) with FAX detect already running.\n", ast_channel_name(chan));
                        }
                } else if (ast_false(val)) {
+                       ast_channel_lock(chan);
                        ast_framehook_detach(chan, details->faxdetect_id);
+                       ast_channel_unlock(chan);
                        details->faxdetect_id = -1;
                } else {
                        ast_log(LOG_WARNING, "Unsupported value '%s' passed to FAXOPT(%s).\n", value, data);

diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c
index 23c377d62daca7bc963f43a98cf69d9eb0027312..8fe4e84772b74c1f01f587ef096db6b388ceaa1d 100644 (file)
--- a/res/res_pjsip_refer.c
+++ b/res/res_pjsip_refer.c
@@ -641,7 +641,9 @@ static void refer_blind_callback(struct ast_channel *chan, struct transfer_chann
                                refer_progress_notify(notification);
                        }
 
+                       ast_channel_lock(chan);
                        ast_framehook_detach(chan, refer->progress->framehook);
+                       ast_channel_unlock(chan);
 
                        ao2_cleanup(refer->progress);
                }