* [PATCH][next] scsi: qla2xxx: fix null pointer dereference on null_fcport
@ 2020-01-06 14:11 Colin King
2020-01-06 14:45 ` Dan Carpenter
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2020-01-06 14:11 UTC (permalink / raw)
To: Himanshu Madhani, James E . J . Bottomley, Martin K . Petersen,
Quinn Tran, linux-scsi, linux-kernel
Cc: kernel-janitors
From: Colin Ian King <colin.king@canonical.com>
Currently several error exit return paths end up passing a null
new_fcport pointer to function qla2x00_free_fcport and this causes
a null pointer dereference. Fix this by moving and renaming the
exit path label to be after the call to qla2x00_free_fcport to avoid
the errorneous and unnecessary call to qla2x00_free_fcport.
Addresses-Coverity: ("Dereference after null check")
Fixes: 3dae220595ba ("scsi: qla2xxx: Use common routine to free fcport struct")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/scsi/qla2xxx/qla_init.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a5076f43edea..ed056626d7a3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5108,7 +5108,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
rval = qla2x00_get_id_list(vha, ha->gid_list, ha->gid_list_dma,
&entries);
if (rval != QLA_SUCCESS)
- goto cleanup_allocation;
+ goto exit;
ql_dbg(ql_dbg_disc, vha, 0x2011,
"Entries in ID list (%d).\n", entries);
@@ -5138,7 +5138,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
ql_log(ql_log_warn, vha, 0x2012,
"Memory allocation failed for fcport.\n");
rval = QLA_MEMORY_ALLOC_FAILED;
- goto cleanup_allocation;
+ goto exit;
}
new_fcport->flags &= ~FCF_FABRIC_DEVICE;
@@ -5228,7 +5228,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
ql_log(ql_log_warn, vha, 0xd031,
"Failed to allocate memory for fcport.\n");
rval = QLA_MEMORY_ALLOC_FAILED;
- goto cleanup_allocation;
+ goto exit;
}
spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
new_fcport->flags &= ~FCF_FABRIC_DEVICE;
@@ -5239,7 +5239,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
/* Base iIDMA settings on HBA port speed. */
fcport->fp_speed = ha->link_data_rate;
- found_devs++;
}
list_for_each_entry(fcport, &vha->vp_fcports, list) {
@@ -5271,9 +5270,9 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
qla24xx_fcport_handle_login(vha, fcport);
}
-cleanup_allocation:
qla2x00_free_fcport(new_fcport);
+exit:
if (rval != QLA_SUCCESS) {
ql_dbg(ql_dbg_disc, vha, 0x2098,
"Configure local loop error exit: rval=%x.\n", rval);
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] scsi: qla2xxx: fix null pointer dereference on null_fcport
2020-01-06 14:11 [PATCH][next] scsi: qla2xxx: fix null pointer dereference on null_fcport Colin King
@ 2020-01-06 14:45 ` Dan Carpenter
0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2020-01-06 14:45 UTC (permalink / raw)
To: Colin King
Cc: Himanshu Madhani, James E . J . Bottomley, Martin K . Petersen,
Quinn Tran, linux-scsi, linux-kernel, kernel-janitors
On Mon, Jan 06, 2020 at 02:11:44PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently several error exit return paths end up passing a null
> new_fcport pointer to function qla2x00_free_fcport and this causes
> a null pointer dereference. Fix this by moving and renaming the
> exit path label to be after the call to qla2x00_free_fcport to avoid
> the errorneous and unnecessary call to qla2x00_free_fcport.
>
> Addresses-Coverity: ("Dereference after null check")
> Fixes: 3dae220595ba ("scsi: qla2xxx: Use common routine to free fcport struct")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/scsi/qla2xxx/qla_init.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
> index a5076f43edea..ed056626d7a3 100644
> --- a/drivers/scsi/qla2xxx/qla_init.c
> +++ b/drivers/scsi/qla2xxx/qla_init.c
> @@ -5108,7 +5108,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
> rval = qla2x00_get_id_list(vha, ha->gid_list, ha->gid_list_dma,
> &entries);
> if (rval != QLA_SUCCESS)
> - goto cleanup_allocation;
> + goto exit;
>
> ql_dbg(ql_dbg_disc, vha, 0x2011,
> "Entries in ID list (%d).\n", entries);
> @@ -5138,7 +5138,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
> ql_log(ql_log_warn, vha, 0x2012,
> "Memory allocation failed for fcport.\n");
> rval = QLA_MEMORY_ALLOC_FAILED;
> - goto cleanup_allocation;
> + goto exit;
> }
> new_fcport->flags &= ~FCF_FABRIC_DEVICE;
>
> @@ -5228,7 +5228,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
> ql_log(ql_log_warn, vha, 0xd031,
> "Failed to allocate memory for fcport.\n");
> rval = QLA_MEMORY_ALLOC_FAILED;
> - goto cleanup_allocation;
> + goto exit;
This leaks now.
> }
> spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
> new_fcport->flags &= ~FCF_FABRIC_DEVICE;
> @@ -5239,7 +5239,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
> /* Base iIDMA settings on HBA port speed. */
> fcport->fp_speed = ha->link_data_rate;
>
> - found_devs++;
Delete "found_devs" completely. Also remove the "new_fcport = NULL;"
line because that's not required any more.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-06 14:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 14:11 [PATCH][next] scsi: qla2xxx: fix null pointer dereference on null_fcport Colin King
2020-01-06 14:45 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).