Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef1cf77 authored by Roman Bolshakov's avatar Roman Bolshakov Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length 

[ Upstream commit 0334cdea1fba36fad8bdf9516f267ce01de625f7 ]

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: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b6a21efb

drivers/scsi/qla2xxx/qla_iocb.c

+4 −2
Original line number Diff line number Diff line
@@ -2537,7 +2537,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);

		els_iocb->tx_address[0] =
@@ -2703,7 +2704,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) {