99f9de65a7ccb2a45f96ea2a0efd0fb2f692dc49
[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 070-v4.5-0001-bgmac-fix-a-missing-check-for-build_skb.patch
1 From f1640c3ddeec12804bc9a21feee85fc15aca95f6 Mon Sep 17 00:00:00 2001
2 From: wangweidong <wangweidong1@huawei.com>
3 Date: Wed, 13 Jan 2016 11:06:41 +0800
4 Subject: [PATCH] bgmac: fix a missing check for build_skb
5
6 when build_skb failed, it may occure a NULL pointer.
7 So add a 'NULL check' for it.
8
9 Signed-off-by: Weidong Wang <wangweidong1@huawei.com>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
11 ---
12 drivers/net/ethernet/broadcom/bgmac.c | 5 +++++
13 1 file changed, 5 insertions(+)
14
15 --- a/drivers/net/ethernet/broadcom/bgmac.c
16 +++ b/drivers/net/ethernet/broadcom/bgmac.c
17 @@ -469,6 +469,11 @@ static int bgmac_dma_rx_read(struct bgma
18 len -= ETH_FCS_LEN;
19
20 skb = build_skb(buf, BGMAC_RX_ALLOC_SIZE);
21 + if (unlikely(skb)) {
22 + bgmac_err(bgmac, "build_skb failed\n");
23 + put_page(virt_to_head_page(buf));
24 + break;
25 + }
26 skb_put(skb, BGMAC_RX_FRAME_OFFSET +
27 BGMAC_RX_BUF_OFFSET + len);
28 skb_pull(skb, BGMAC_RX_FRAME_OFFSET +