From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Weidong Wang <wangweidong1@huawei.com>,
David Miller <davem@davemloft.net>,
nbd@openwrt.org, zajec5@gmail.com, hauke@hauke-m.de,
Joe Perches <joe@perches.com>,
peter.senna@gmail.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: bgmac: fix a missing check for build_skb
Date: Wed, 13 Jan 2016 15:10:12 +0300 [thread overview]
Message-ID: <56963EA4.1040704@cogentembedded.com> (raw)
In-Reply-To: <5695BF41.2040002@huawei.com>
Hello.
On 1/13/2016 6:06 AM, 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 <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)) {
!skb , you mean?
> + 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 +
MBR, Sergei
prev parent reply other threads:[~2016-01-13 12:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 3:06 bgmac: fix a missing check for build_skb Weidong Wang
2016-01-13 5:24 ` David Miller
2016-01-13 8:34 ` Paolo Abeni
2016-01-13 10:25 ` Weidong Wang
2016-01-13 10:57 ` Felix Fietkau
2016-01-13 11:31 ` Weidong Wang
2016-01-13 15:34 ` David Miller
2016-01-13 11:53 ` [PATCH net-next v2] " Weidong Wang
2016-01-13 14:52 ` Eric Dumazet
2016-01-14 2:10 ` Weidong Wang
2016-01-13 12:10 ` Sergei Shtylyov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56963EA4.1040704@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=davem@davemloft.net \
--cc=hauke@hauke-m.de \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=peter.senna@gmail.com \
--cc=wangweidong1@huawei.com \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).