]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mwl8k: fix NULL pointer dereference on receive out-of-memory
authorLennert Buytenhek <buytenh@wantstofly.org>
Mon, 3 Aug 2009 19:58:26 +0000 (21:58 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Aug 2009 17:09:29 +0000 (13:09 -0400)
When we go into out-of-memory and fail to allocate skbuffs to
refill the receive ring with, rxq_process can end up running into
a receive ring entry that is marked as host-owned but doesn't have
an associated skbuff.  If this happens, we must break out of the
rx processing loop instead of trying to process the descriptor.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwl8k.c

index a263d5c84c0874857b8ee02243cff89bc9e8eee6..71f3eb67981e14349304f6f216a0365b84d34ed7 100644 (file)
@@ -1012,6 +1012,8 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
                rmb();
 
                skb = rxq->rx_skb[rxq->rx_head];
+               if (skb == NULL)
+                       break;
                rxq->rx_skb[rxq->rx_head] = NULL;
 
                rxq->rx_head = (rxq->rx_head + 1) % MWL8K_RX_DESCS;