linux-kernel - Re: [PATCH] scsi: osd_uld: remove an unneeded NULL check

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:   Thu, 23 Mar 2017 21:38:31 +0200
From:   Boaz Harrosh <ooo@...ctrozaur.com>
To:     Dan Carpenter <dan.carpenter@...cle.com>
Cc:     Benny Halevy <bhalevy@...marydata.com>,
        "James E.J. Bottomley" <jejb@...ux.vnet.ibm.com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>,
        osd-dev@...n-osd.org, linux-scsi@...r.kernel.org,
        linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: Re: [PATCH] scsi: osd_uld: remove an unneeded NULL check

On 03/23/2017 12:41 PM, Dan Carpenter wrote:
> We don't call the remove() function unless probe() succeeds so "oud"
> can't be NULL here.  Plus, if it were NULL, we dereference it on the
> next line so it would crash anyway.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
> 

Thanks sure!
ACK-by Boaz Harrosh <ooo@...ctrozaur.com>

> diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
> index 4101c3178411..8b9941a5687a 100644
> --- a/drivers/scsi/osd/osd_uld.c
> +++ b/drivers/scsi/osd/osd_uld.c
> @@ -507,10 +507,9 @@ static int osd_remove(struct device *dev)
>  	struct scsi_device *scsi_device = to_scsi_device(dev);
>  	struct osd_uld_device *oud = dev_get_drvdata(dev);
>  
> -	if (!oud || (oud->od.scsi_device != scsi_device)) {
> -		OSD_ERR("Half cooked osd-device %p,%p || %p!=%p",
> -			dev, oud, oud ? oud->od.scsi_device : NULL,
> -			scsi_device);
> +	if (oud->od.scsi_device != scsi_device) {
> +		OSD_ERR("Half cooked osd-device %p, || %p!=%p",
> +			dev, oud->od.scsi_device, scsi_device);
>  	}
>  
>  	cdev_device_del(&oud->cdev, &oud->class_dev);
>