From 3db405486e119f43ac7a8d48bfb4044e1912dccb Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Mon, 25 Oct 2010 18:26:27 +0000
Subject: [PATCH] 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@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9457 a0bf4364-ded3-4de4-8d8a-66a801d63aff
---
 drivers/dahdi/dahdi-base.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index a595bb0..da797fd 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -4819,7 +4819,8 @@ static int dahdi_ioctl_setconf(struct file *file, unsigned long data)
 	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;