[asterisk-commits] mmichelson: branch 1.6.0 r114210 - in /branches/1.6.0: ./ include/asterisk/ m...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 17 11:48:48 CDT 2008
Author: mmichelson
Date: Thu Apr 17 11:48:47 2008
New Revision: 114210
URL: http://svn.digium.com/view/asterisk?view=rev&rev=114210
Log:
Merged revisions 114208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114208 | mmichelson | 2008-04-17 11:40:12 -0500 (Thu, 17 Apr 2008) | 20 lines
Merged revisions 114207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114207 | mmichelson | 2008-04-17 11:28:03 -0500 (Thu, 17 Apr 2008) | 12 lines
It was possible for a reference to a frame which was part of a freed DSP to still be
referenced, leading to memory corruption and eventual crashes. This code change ensures
that the dsp is freed when we are finished with the frame. This change is very similar
to a change Russell made with translators back a month or so ago.
(closes issue #11999)
Reported by: destiny6628
Patches:
11999.patch uploaded by putnopvut (license 60)
Tested by: destiny6628, victoryure
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/include/asterisk/dsp.h
branches/1.6.0/include/asterisk/frame.h
branches/1.6.0/main/dsp.c
branches/1.6.0/main/frame.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/include/asterisk/dsp.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/dsp.h?view=diff&rev=114210&r1=114209&r2=114210
==============================================================================
--- branches/1.6.0/include/asterisk/dsp.h (original)
+++ branches/1.6.0/include/asterisk/dsp.h Thu Apr 17 11:48:47 2008
@@ -115,4 +115,16 @@
/*! \brief Get tcount (Threshold counter) */
int ast_dsp_get_tcount(struct ast_dsp *dsp);
+/*!
+ * \brief Hint that a frame from a dsp was freed
+ *
+ * This is called from ast_frame_free if AST_FRFLAG_FROM_DSP is set. This occurs
+ * because it is possible for the dsp to be freed while someone still holds a reference
+ * to the frame that is in that dsp. This has been known to happen when the dsp on a Zap
+ * channel detects a busy signal. The channel is hung up, and the application that read the
+ * frame to begin with still has a reference to the frame.
+ *
+ * \return nothing
+ */
+void ast_dsp_frame_freed(struct ast_frame *fr);
#endif /* _ASTERISK_DSP_H */
Modified: branches/1.6.0/include/asterisk/frame.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/frame.h?view=diff&rev=114210&r1=114209&r2=114210
==============================================================================
--- branches/1.6.0/include/asterisk/frame.h (original)
+++ branches/1.6.0/include/asterisk/frame.h Thu Apr 17 11:48:47 2008
@@ -130,6 +130,10 @@
* The translator can not be free'd if the frame inside of it still has
* this flag set. */
AST_FRFLAG_FROM_TRANSLATOR = (1 << 1),
+ /*! This frame came from a dsp and is still the original frame.
+ * The dsp cannot be free'd if the frame inside of it still has
+ * this flag set. */
+ AST_FRFLAG_FROM_DSP = (1 << 2),
};
/*! \brief Data structure associated with a single frame of data
Modified: branches/1.6.0/main/dsp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/dsp.c?view=diff&rev=114210&r1=114209&r2=114210
==============================================================================
--- branches/1.6.0/main/dsp.c (original)
+++ branches/1.6.0/main/dsp.c Thu Apr 17 11:48:47 2008
@@ -1241,6 +1241,7 @@
memset(&dsp->f, 0, sizeof(dsp->f));
dsp->f.frametype = AST_FRAME_NULL;
ast_frfree(af);
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
}
if ((dsp->features & DSP_FEATURE_BUSY_DETECT) && ast_dsp_busydetect(dsp)) {
@@ -1250,6 +1251,7 @@
dsp->f.subclass = AST_CONTROL_BUSY;
ast_frfree(af);
ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name);
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
}
if (((dsp->features & DSP_FEATURE_DTMF_DETECT) || (dsp->features & DSP_FEATURE_FAX_DETECT))) {
@@ -1271,6 +1273,7 @@
if (chan)
ast_queue_frame(chan, af);
ast_frfree(af);
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
}
} else {
@@ -1297,6 +1300,7 @@
ast_queue_frame(chan, af);
ast_frfree(af);
}
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
} else {
memset(&dsp->f, 0, sizeof(dsp->f));
@@ -1314,6 +1318,7 @@
if (chan)
ast_queue_frame(chan, af);
ast_frfree(af);
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
}
}
@@ -1331,6 +1336,7 @@
if (chan)
ast_queue_frame(chan, af);
ast_frfree(af);
+ ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
return &dsp->f;
}
}
@@ -1403,6 +1409,17 @@
void ast_dsp_free(struct ast_dsp *dsp)
{
+ if (ast_test_flag(&dsp->f, AST_FRFLAG_FROM_DSP)) {
+ /* If this flag is still set, that means that the dsp's destruction
+ * been torn down, while we still have a frame out there being used.
+ * When ast_frfree() gets called on that frame, this ast_trans_pvt
+ * will get destroyed, too. */
+
+ /* Set the magic flag to destroy the dsp when the frame is freed */
+ dsp->freqcount = -1;
+
+ return;
+ }
ast_free(dsp);
}
@@ -1516,3 +1533,17 @@
{
return dsp->tcount;
}
+
+void ast_dsp_frame_freed(struct ast_frame *fr)
+{
+ struct ast_dsp *dsp;
+
+ ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
+
+ dsp = (struct ast_dsp *) (((char *) fr) - offsetof(struct ast_dsp, f));
+
+ if (dsp->freqcount != -1)
+ return;
+
+ ast_dsp_free(dsp);
+}
Modified: branches/1.6.0/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/frame.c?view=diff&rev=114210&r1=114209&r2=114210
==============================================================================
--- branches/1.6.0/main/frame.c (original)
+++ branches/1.6.0/main/frame.c Thu Apr 17 11:48:47 2008
@@ -37,6 +37,7 @@
#include "asterisk/threadstorage.h"
#include "asterisk/linkedlists.h"
#include "asterisk/translate.h"
+#include "asterisk/dsp.h"
#ifdef TRACE_FRAMES
static int headers;
@@ -308,6 +309,8 @@
{
if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR))
ast_translate_frame_freed(fr);
+ else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP))
+ ast_dsp_frame_freed(fr);
if (!fr->mallocd)
return;
@@ -357,6 +360,7 @@
void *newdata;
ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
+ ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
if (!(fr->mallocd & AST_MALLOCD_HDR)) {
/* Allocate a new header if needed */
More information about the asterisk-commits
mailing list