| From 832794910db84164d0ef07b2a2ced3278bc0d6fb Mon Sep 17 00:00:00 2001 |
| From: Roman Bolshakov <r.bolshakov@yadro.com> |
| Date: Mon, 25 Nov 2019 19:56:57 +0300 |
| Subject: [PATCH] scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length |
| |
| commit 0334cdea1fba36fad8bdf9516f267ce01de625f7 upstream. |
| |
| The size of the buffer is hardcoded as 0x70 or 112 bytes, while the size of |
| ELS IOCB is 0x40 and the size of PLOGI payload returned by Get Parameters |
| command is 0x74. |
| |
| Cc: Quinn Tran <qutran@marvell.com> |
| Link: https://lore.kernel.org/r/20191125165702.1013-9-r.bolshakov@yadro.com |
| Acked-by: Himanshu Madhani <hmadhani@marvell.com> |
| Reviewed-by: Hannes Reinecke <hare@suse.de> |
| Tested-by: Hannes Reinecke <hare@suse.de> |
| Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c |
| index 6906bbcf5492..4ab44f8fb285 100644 |
| --- a/drivers/scsi/qla2xxx/qla_iocb.c |
| +++ b/drivers/scsi/qla2xxx/qla_iocb.c |
| @@ -2723,7 +2723,8 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) |
| ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x3073, |
| "PLOGI ELS IOCB:\n"); |
| ql_dump_buffer(ql_log_info, vha, 0x0109, |
| - (uint8_t *)els_iocb, 0x70); |
| + (uint8_t *)els_iocb, |
| + sizeof(*els_iocb)); |
| } else { |
| els_iocb->tx_byte_count = sizeof(struct els_logo_payload); |
| put_unaligned_le64(elsio->u.els_logo.els_logo_pyld_dma, |
| @@ -2884,7 +2885,8 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode, |
| |
| ql_dbg(ql_dbg_disc + ql_dbg_buffer, vha, 0x3073, "PLOGI buffer:\n"); |
| ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, vha, 0x0109, |
| - (uint8_t *)elsio->u.els_plogi.els_plogi_pyld, 0x70); |
| + (uint8_t *)elsio->u.els_plogi.els_plogi_pyld, |
| + sizeof(*elsio->u.els_plogi.els_plogi_pyld)); |
| |
| rval = qla2x00_start_sp(sp); |
| if (rval != QLA_SUCCESS) { |
| -- |
| 2.7.4 |
| |
