[svn-commits] rmeyerriecks: linux/trunk r10140 - /linux/trunk/drivers/dahdi/wct4xxp/base.c

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Aug 15 16:57:49 2011
New Revision: 10140

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10140
Log:
wct4xxp: Bug in timing cable with different span density cards

The logic loops through the static cards[] array to determine timing,
    but the subloop was based off the current card's numspans member.
    This could cause a null dereference in the case where two cards of
    different span densities were connected via timing cables.

Reported-by: Doug Bailey <dbailey at digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

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

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10140&r1=10139&r2=10140
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Mon Aug 15 16:57:49 2011
@@ -2384,7 +2384,7 @@
 		while (p < 8) {
 			nonzero = 0;
 			for (x=0;cards[x];x++) {
-				for (i = 0; i < wc->numspans; i++) {
+				for (i = 0; i < cards[x]->numspans; i++) {
 					if (cards[x]->tspans[i]->syncpos) {
 						nonzero = 1;
 						if ((cards[x]->tspans[i]->syncpos == p) &&