[svn-commits] sruffell: linux/trunk r9457 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Oct 25 13:26:27 2010
New Revision: 9457

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9457
Log:
dahdi: Eliminate NULL dereference when bridging channels.

When using conference mode DAHDI_CONF_DIGITALMON ensure conf_chan is
set.  Otherwise we dereference a NULL 'conf_chan'.

Fixes regression introduced in revision 9381

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9457&r1=9456&r2=9457
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Oct 25 13:26:27 2010
@@ -4819,7 +4819,8 @@
 	if (!(chan->flags & DAHDI_FLAG_AUDIO))
 		return -EINVAL;
 
-	if (is_monitor_mode(conf.confmode)) {
+	if ((DAHDI_CONF_DIGITALMON == confmode) ||
+	    is_monitor_mode(conf.confmode)) {
 		conf_chan = chan_from_num(conf.confno);
 		if (!conf_chan)
 			return -EINVAL;