scsi:libfc:fix fc_lport_ptp_setup(): Null pointer dereferences

Commit Message

Wu Bo Dec. 17, 2019, 2:26 p.m. UTC

From: Wu Bo <[e-mail]>

The code following:
fc_rport_create()
    ...
    rdata = kzalloc(sizeof(*rdata) + lport->rport_priv_size, GFP_KERNEL);
    if (!rdata)
        return NULL;
    ...

fc_lport_ptp_setup()
   ...
   lport->ptp_rdata = fc_rport_create(lport, remote_fid);
   kref_get(&lport->ptp_rdata->kref);
   lport->ptp_rdata->ids.port_name = remote_wwpn;
   ...

Fix by adding a check for lport->ptp_rdata before be used on fc_lport_ptp_setup func.

Signed-off-by: Wu Bo <[e-mail]>
---
 drivers/scsi/libfc/fc_lport.c | 4 ++++
 1 file changed, 4 insertions(+)

--
1.8.3.1

Patch

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 684c5e3..36e7bdd 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -238,6 +238,10 @@  static void fc_lport_ptp_setup(struct fc_lport *lport,
        }
        mutex_lock(&lport->disc.disc_mutex);
        lport->ptp_rdata = fc_rport_create(lport, remote_fid);
+       if (!lport->ptp_rdata) {
+               mutex_unlock(&lport->disc.disc_mutex);
+               return;
+       }
        kref_get(&lport->ptp_rdata->kref);
        lport->ptp_rdata->ids.port_name = remote_wwpn;
        lport->ptp_rdata->ids.node_name = remote_wwnn;