diff options
| author |   wangweidong <wangweidong1@huawei.com> | 2016-01-13 11:06:41 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-01-13 00:24:14 -0500 |
| commit | f1640c3ddeec12804bc9a21feee85fc15aca95f6 (patch) | |
| tree | 649018db5e4b76d456b53f1ad8a737b342af0fe7 /drivers | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (diff) | |
| download | linux-dev-f1640c3ddeec12804bc9a21feee85fc15aca95f6.tar.xz linux-dev-f1640c3ddeec12804bc9a21feee85fc15aca95f6.zip | |
bgmac: fix a missing check for build_skb
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index c7798d360512..397415217125 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 + |