netdev - Re: [patch -next] net: dwc-xlgmac: fix an error code in xlgmac_alloc

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]

Date:   Wed, 22 Mar 2017 12:16:36 +0800
From:   Jie Deng <Jie.Deng1@...opsys.com>
To:     Dan Carpenter <dan.carpenter@...cle.com>,
        Jie Deng <Jie.Deng1@...opsys.com>
CC:     <netdev@...r.kernel.org>, <kernel-janitors@...r.kernel.org>
Subject: Re: [patch -next] net: dwc-xlgmac: fix an error code in
 xlgmac_alloc_pages()

On 2017/3/22 4:42, Dan Carpenter wrote:

> The dma_mapping_error() returns true if there is an error but we want
> to return -ENOMEM and not 1.
>
> Fixes: 65e0ace2c5cd ("net: dwc-xlgmac: Initial driver for DesignWare Enterprise Ethernet")
> Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
>
> diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> index 55c796ed7d26..39b5cb967bba 100644
> --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
> @@ -335,7 +335,6 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
>  {
>  	struct page *pages = NULL;
>  	dma_addr_t pages_dma;
> -	int ret;
>  
>  	/* Try to obtain pages, decreasing order if necessary */
>  	gfp |= __GFP_COLD | __GFP_COMP | __GFP_NOWARN;
> @@ -352,10 +351,9 @@ static int xlgmac_alloc_pages(struct xlgmac_pdata *pdata,
>  	/* Map the pages */
>  	pages_dma = dma_map_page(pdata->dev, pages, 0,
>  				 PAGE_SIZE << order, DMA_FROM_DEVICE);
> -	ret = dma_mapping_error(pdata->dev, pages_dma);
> -	if (ret) {
> +	if (dma_mapping_error(pdata->dev, pages_dma)) {
>  		put_page(pages);
> -		return ret;
> +		return -ENOMEM;
>  	}
>  
>  	pa->pages = pages;
Thanks for fixes.
Reviewed-by: Jie Deng <jiedeng@...opsys.com>