linux-kernel - Re: [PATCH] usnic: correctly check failed allocation

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] [day] [month] [year] [list]

Date:	Wed, 21 Oct 2015 16:43:39 -0400
From:	Doug Ledford <dledford@...hat.com>
To:	Insu Yun <wuninsu@...il.com>, umalhi@...co.com,
	sean.hefty@...el.com, hal.rosenstock@...il.com,
	linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:	taesoo@...ech.edu, yeongjin.jang@...ech.edu, insu@...ech.edu
Subject: Re: [PATCH] usnic: correctly check failed allocation

On 10/15/2015 05:15 PM, Insu Yun wrote:
> Since ib_alloc_device returns allocated memory address, not error,
> it should be checked as IS_NULL, not IS_ERR_OR_NULL.
> 
> Signed-off-by: Insu Yun <wuninsu@...il.com>

Thanks, applied.

> ---
>  drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> index 34c49b8..cbc0514 100644
> --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
> +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
> @@ -328,16 +328,15 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
>  	netdev = pci_get_drvdata(dev);
>  
>  	us_ibdev = (struct usnic_ib_dev *)ib_alloc_device(sizeof(*us_ibdev));
> -	if (IS_ERR_OR_NULL(us_ibdev)) {
> +	if (!us_ibdev) {
>  		usnic_err("Device %s context alloc failed\n",
>  				netdev_name(pci_get_drvdata(dev)));
> -		return ERR_PTR(us_ibdev ? PTR_ERR(us_ibdev) : -EFAULT);
> +		return ERR_PTR(-EFAULT);
>  	}
>  
>  	us_ibdev->ufdev = usnic_fwd_dev_alloc(dev);
> -	if (IS_ERR_OR_NULL(us_ibdev->ufdev)) {
> -		usnic_err("Failed to alloc ufdev for %s with err %ld\n",
> -				pci_name(dev), PTR_ERR(us_ibdev->ufdev));
> +	if (!us_ibdev->ufdev) {
> +		usnic_err("Failed to alloc ufdev for %s\n", pci_name(dev));
>  		goto err_dealloc;
>  	}
>  
> 


-- 
Doug Ledford <dledford@...hat.com>
              GPG KeyID: 0E572FDD



Download attachment "signature.asc" of type "application/pgp-signature" (885 bytes)