linux-kernel - Re: [PATCH net-next] hip04_eth: fix missing error handle for build

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5695C919.8070203@huawei.com>
Date:	Wed, 13 Jan 2016 11:48:41 +0800
From:	Ding Tianhong <dingtianhong@...wei.com>
To:	Weidong Wang <wangweidong1@...wei.com>,
	David Miller <davem@...emloft.net>, <arnd@...db.de>,
	<zhangfei.gao@...aro.org>, <dan.carpenter@...cle.com>,
	<tglx@...utronix.de>
CC:	<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH net-next] hip04_eth: fix missing error handle for build_skb
 failed

On 2016/1/13 11:11, Weidong Wang wrote:
> when build_skb failed, we should goto refill the buffer.
> 
> Signed-off-by: Weidong Wang <wangweidong1@...wei.com>
> ---

Acked-by: Ding Tainhong <dingtianhong@...wei.com>

>  drivers/net/ethernet/hisilicon/hip04_eth.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
> index 3b39fdd..417f131 100644
> --- a/drivers/net/ethernet/hisilicon/hip04_eth.c
> +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
> @@ -500,8 +500,10 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
>  	while (cnt && !last) {
>  		buf = priv->rx_buf[priv->rx_head];
>  		skb = build_skb(buf, priv->rx_buf_size);
> -		if (unlikely(!skb))
> +		if (unlikely(!skb)) {
>  			net_dbg_ratelimited("build_skb failed\n");
> +			goto refill;
> +		}
> 
>  		dma_unmap_single(&ndev->dev, priv->rx_phys[priv->rx_head],
>  				 RX_BUF_SIZE, DMA_FROM_DEVICE);
> @@ -528,6 +530,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget)
>  			rx++;
>  		}
> 
> +refill:
>  		buf = netdev_alloc_frag(priv->rx_buf_size);
>  		if (!buf)
>  			goto done;
>