linux-kernel - Re: [PATCH] scsi: fnic: Validate io

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: <0C569CCE-A202-4C01-B112-92080126BA87@cisco.com>
Date:   Tue, 24 Nov 2020 01:32:30 +0000
From:   "Arulprabhu Ponnusamy (arulponn)" <arulponn@...co.com>
To:     "Karan Tilak Kumar (kartilak)" <kartilak@...co.com>,
        "Satish Kharat (satishkh)" <satishkh@...co.com>
CC:     "Sesidhar Baddela (sebaddel)" <sebaddel@...co.com>,
        "jejb@...ux.ibm.com" <jejb@...ux.ibm.com>,
        "martin.petersen@...cle.com" <martin.petersen@...cle.com>,
        "linux-scsi@...r.kernel.org" <linux-scsi@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] scsi: fnic: Validate io_req before others

Looks good.
Reviewed-by: Arulprabhu Ponnusamy <arulponn@...co.com>

On 11/20/20, 6:33 PM, "Karan Tilak Kumar" <kartilak@...co.com> wrote:

    We need to check for a valid io_req before
    we check other data. Also, removing
    redundant checks.

    Signed-off-by: Karan Tilak Kumar <kartilak@...co.com>
    Signed-off-by: Satish Kharat <satishkh@...co.com>
    ---
     drivers/scsi/fnic/fnic.h      | 2 +-
     drivers/scsi/fnic/fnic_scsi.c | 9 ++++-----
     2 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
    index e4d399f41a0a..69f373b53132 100644
    --- a/drivers/scsi/fnic/fnic.h
    +++ b/drivers/scsi/fnic/fnic.h
    @@ -39,7 +39,7 @@

     #define DRV_NAME		"fnic"
     #define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"
    -#define DRV_VERSION		"1.6.0.52"
    +#define DRV_VERSION		"1.6.0.53"
     #define PFX			DRV_NAME ": "
     #define DFX                     DRV_NAME "%d: "

    diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
    index 532c3c7ae372..36744968378f 100644
    --- a/drivers/scsi/fnic/fnic_scsi.c
    +++ b/drivers/scsi/fnic/fnic_scsi.c
    @@ -1735,15 +1735,14 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
     			continue;
     		}

    -		cmd_rport = starget_to_rport(scsi_target(sc->device));
    -		if (rport != cmd_rport) {
    +		io_req = (struct fnic_io_req *)CMD_SP(sc);
    +		if (!io_req) {
     			spin_unlock_irqrestore(io_lock, flags);
     			continue;
     		}

    -		io_req = (struct fnic_io_req *)CMD_SP(sc);
    -
    -		if (!io_req || rport != cmd_rport) {
    +		cmd_rport = starget_to_rport(scsi_target(sc->device));
    +		if (rport != cmd_rport) {
     			spin_unlock_irqrestore(io_lock, flags);
     			continue;
     		}
    -- 
    2.29.2