diff options
author | Shaun Ruffell <sruffell@digium.com> | 2010-10-25 18:26:27 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2010-10-25 18:26:27 +0000 |
commit | 5bc10b53a0d4bf388ce7c992ae0b3c2c07307a25 (patch) | |
tree | 2997e080e8c93f1505a96a94b357b7107aa413d7 /drivers/dahdi | |
parent | bfe7f5196875efdb000b5f5c0e43dc1c78fc3689 (diff) |
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
Diffstat (limited to 'drivers/dahdi')
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |