From: Zhu Yi <yi.zhu@intel.com>
Date: Tue, 14 Feb 2006 08:02:22 +0000 (+0800)
Subject: [PATCH] ipw2200: fix a potential NULL pointer dereference
X-Git-Tag: v2.6.17-rc1~1186^2^2~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85149bace30eae1dc1f86d2c327329673123dd22;p=linux-2.6

[PATCH] ipw2200: fix a potential NULL pointer dereference

Only on CONFIG_IPW2200_DEBUG is not defined

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 4722de13f1..129891feb4 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7809,12 +7809,10 @@ static void ipw_rx(struct ipw_priv *priv)
 
 	while (i != r) {
 		rxb = priv->rxq->queue[i];
-#ifdef CONFIG_IPW2200_DEBUG
 		if (unlikely(rxb == NULL)) {
 			printk(KERN_CRIT "Queue not allocated!\n");
 			break;
 		}
-#endif
 		priv->rxq->queue[i] = NULL;
 
 		pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr,