]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
p54: fix oops caused by bad eeproms
authorChristian Lamparter <chunkeey@web.de>
Fri, 9 Jan 2009 20:06:30 +0000 (21:06 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Jan 2009 22:08:22 +0000 (17:08 -0500)
This patch fixes a bug that could occur, if it the eeprom is incomplete or partly corrupted.

BUG: unable to handle kernel NULL pointer dereference at 00000008
IP: p54_assign_address+0x108/0x15d [p54common]
Oops: 0002 [#1] SMP
Pid: 12988, comm: phy1 Tainted: P        W  2.6.28-rc6-wl #3
RIP: 0010: p54_assign_address+0x108/0x15d [p54common]
 [...]
Call Trace:
 p54_alloc_skb+0xa3/0xc0 [p54common]
 p54_scan+0x37/0x204 [p54common]
 [...]

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/p54/p54common.c

index c6a370fa9bcbf11115fdd9063327356339f4504d..3b44e8e76030ad1ae3e2379e5ce4358cedf308b9 100644 (file)
@@ -1610,7 +1610,7 @@ static int p54_scan(struct ieee80211_hw *dev, u16 mode, u16 dwell)
 
  err:
        printk(KERN_ERR "%s: frequency change failed\n", wiphy_name(dev->wiphy));
-       kfree_skb(skb);
+       p54_free_skb(dev, skb);
        return -EINVAL;
 }