bgmac: fix a missing check for build_skb

From	Weidong Wang <wangweidong1@huawei.com>
Newsgroups	linux.kernel
Subject	bgmac: fix a missing check for build_skb
Date	2016-01-13 04:10 +0100
Message-ID	<qQjYR-1Vd-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

when build_skb failed, it may occure a NULL pointer.
So add a 'NULL check' for it.

Signed-off-by: Weidong Wang <wangweidong1@huawei.com>
---
 drivers/net/ethernet/broadcom/bgmac.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 21e3c38..d75180a 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -466,6 +466,11 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
 			len -= ETH_FCS_LEN;

 			skb = build_skb(buf, BGMAC_RX_ALLOC_SIZE);
+			if (unlikely(skb)) {
+				bgmac_err(bgmac, "build_skb failed\n");
+				put_page(virt_to_head_page(buf));
+				break;
+			}
 			skb_put(skb, BGMAC_RX_FRAME_OFFSET +
 				BGMAC_RX_BUF_OFFSET + len);
 			skb_pull(skb, BGMAC_RX_FRAME_OFFSET +
-- 
1.9.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

bgmac: fix a missing check for build_skb Weidong Wang <wangweidong1@huawei.com> - 2016-01-13 04:10 +0100
  Re: bgmac: fix a missing check for build_skb David Miller <davem@davemloft.net> - 2016-01-13 06:30 +0100
  Re: bgmac: fix a missing check for build_skb Paolo Abeni <pabeni@redhat.com> - 2016-01-13 09:40 +0100
    Re: bgmac: fix a missing check for build_skb Weidong Wang <wangweidong1@huawei.com> - 2016-01-13 11:30 +0100
      Re: bgmac: fix a missing check for build_skb Felix Fietkau <nbd@openwrt.org> - 2016-01-13 12:00 +0100
        Re: bgmac: fix a missing check for build_skb Weidong Wang <wangweidong1@huawei.com> - 2016-01-13 12:40 +0100
        Re: bgmac: fix a missing check for build_skb David Miller <davem@davemloft.net> - 2016-01-13 16:40 +0100
  [PATCH net-next v2] bgmac: fix a missing check for build_skb Weidong Wang <wangweidong1@huawei.com> - 2016-01-13 13:00 +0100
    Re: [PATCH net-next v2] bgmac: fix a missing check for build_skb Eric Dumazet <eric.dumazet@gmail.com> - 2016-01-13 16:00 +0100
      Re: [PATCH net-next v2] bgmac: fix a missing check for build_skb Weidong Wang <wangweidong1@huawei.com> - 2016-01-14 03:20 +0100
  Re: bgmac: fix a missing check for build_skb Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-01-13 13:20 +0100

csiph-web