diff options
| author | Kinsey Moore <kmoore@digium.com> | 2010-10-20 16:20:30 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2010-10-20 16:20:30 +0000 |
| commit | 0d389eca024a1d4ebe68c72f0d1f397555745e41 (patch) | |
| tree | 12bf656f3e4a20dc26a32d3b98db275f55678f9c /drivers/dahdi/dahdi-base.c | |
| parent | 32f5f5b67d98fb2af373fac062ab69afeacb073f (diff) | |
dahdi-base: Fixed null pointer dereference in dahdi_check_conf
Fixes regression from rev 9366
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9449 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 5e654f6..a595bb0 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -951,8 +951,11 @@ static void dahdi_check_conf(int x) for (y = 0; y < maxchans; y++) { struct dahdi_chan *const chan = chan_from_num(y); - const int confmode = chan->confmode & DAHDI_CONF_MODE_MASK; - if (chan && (chan->confna == x) && + int confmode; + if (!chan) + continue; + confmode = chan->confmode & DAHDI_CONF_MODE_MASK; + if ((chan->confna == x) && (confmode == DAHDI_CONF_CONF || confmode == DAHDI_CONF_CONFANN || confmode == DAHDI_CONF_CONFMON || |