| Message ID | 56963AA3.2010804@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2016-01-13 at 19:53 +0800, Weidong Wang wrote: > when build_skb failed, it may occur a NULL pointer. > So add a 'NULL check' for it. > > Signed-off-by: Weidong Wang <wangweidong1@huawei.com> > --- > change log: > v2: > fix the error logic change which pointed by Paolo Abni > and Felix. This is too late, you have to send a relative patch, since the prior one was merged.
On 2016/1/13 22:52, Eric Dumazet wrote: > On Wed, 2016-01-13 at 19:53 +0800, Weidong Wang wrote: >> when build_skb failed, it may occur a NULL pointer. >> So add a 'NULL check' for it. >> >> Signed-off-by: Weidong Wang <wangweidong1@huawei.com> >> --- >> change log: >> v2: >> fix the error logic change which pointed by Paolo Abni >> and Felix. > > This is too late, you have to send a relative patch, since the prior one > was merged. > > OK. Regards, Weidong > >
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 +
when build_skb failed, it may occur a NULL pointer. So add a 'NULL check' for it. Signed-off-by: Weidong Wang <wangweidong1@huawei.com> --- 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(+)