FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Eliminate NULL dereference when bridging channels.

Browse Source 
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
This commit is contained in:
Shaun Ruffell 2010-10-25 18:26:27 +00:00
parent cba1734e18
commit 3db405486e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dahdi/dahdi-base.c
View File

@ -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;