From: Weidong Wang Subject: [PATCH net-next v2] bgmac: fix a missing check for build_skb Date: Wed, 13 Jan 2016 19:53:07 +0800 Message-ID: <56963AA3.2010804@huawei.com> References: <5695BF41.2040002@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Cc: , , Paolo Abeni To: David Miller , , , , Joe Perches , Return-path: In-Reply-To: <5695BF41.2040002@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org when build_skb failed, it may occur a NULL pointer. So add a 'NULL check' for it. Signed-off-by: Weidong Wang --- change log: v2: fix the error logic change which pointed by Paolo Abni and Felix. --- 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 c7798d3..3974152 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