From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756899AbcAMK0e (ORCPT ); Wed, 13 Jan 2016 05:26:34 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:26341 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756852AbcAMK0P (ORCPT ); Wed, 13 Jan 2016 05:26:15 -0500 Message-ID: <5696262D.3040803@huawei.com> Date: Wed, 13 Jan 2016 18:25:49 +0800 From: Weidong Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Paolo Abeni CC: David Miller , , , , Joe Perches , , , Subject: Re: bgmac: fix a missing check for build_skb References: <5695BF41.2040002@huawei.com> <1452674087.4516.3.camel@redhat.com> In-Reply-To: <1452674087.4516.3.camel@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.21.100] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.5696263B.0136,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: dc74ec463dffd68e7e7f0fdb86fa9626 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/1/13 16:34, Paolo Abeni wrote: > On Wed, 2016-01-13 at 11:06 +0800, Weidong Wang wrote: >> when build_skb failed, it may occure a NULL pointer. >> So add a 'NULL check' for it. >> >> Signed-off-by: Weidong Wang >> --- >> 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)) { > > Should that be instead: > > if (unlikely(!skb)) { > > ? > What to instead of it? Regards, Weidong >> + 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 + > > > . >