From: andrea merello Date: Tue, 18 Feb 2014 01:10:43 +0000 (+0100) Subject: rtl818x: make dev_alloc_skb() null pointer check to really work X-Git-Tag: accepted/tizen/common/20141203.182822~316^2~18^2^2~234 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4da18bb4fb53537a279fe899620de9af4bf4695c;p=platform%2Fkernel%2Flinux-arm64.git rtl818x: make dev_alloc_skb() null pointer check to really work During driver initialization, some skbs are preallocated for RX. Currenly if the allocation fails, the driver's allocation routine exits immediatly but it will return zero (success) anyway. In this way the driver will continue initialization with buggy pointers around. This patch makes the driver's allocation routine to return an error value and to print a complaint message when skb allocation fails. In this way its caller will not go further, avoinding the driver to successfully load, and preventing dereferencing buggy pointers. An hint is thus printed about why the driver failed. Signed-off-by: Andrea Merello Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 0102da2..a9af83e 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -476,9 +476,10 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev) struct sk_buff *skb = dev_alloc_skb(MAX_RX_SIZE); dma_addr_t *mapping; entry = &priv->rx_ring[i]; - if (!skb) - return 0; - + if (!skb) { + wiphy_err(dev->wiphy, "Cannot allocate RX skb\n"); + return -ENOMEM; + } priv->rx_buf[i] = skb; mapping = (dma_addr_t *)skb->cb; *mapping = pci_map_single(priv->pdev, skb_tail_pointer(skb),