Commit a113c02f authored by Dan Carpenter's avatar Dan Carpenter Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Fix error codes in mpi3mr_report_manufacture() 

There are three error paths which return success:

1) Propagate the error code from mpi3mr_post_transport_req() if it fails.

2) Return -EINVAL if "ioc_status != MPI3_IOCSTATUS_SUCCESS".

3) Return -EINVAL if "le16_to_cpu(mpi_reply.response_data_length) !=
   sizeof(struct rep_manu_reply)"

Link: https://lore.kernel.org/r/YyMIJh1HU2Qz9+Rs@kili


Fixes: 2bd37e28 ("scsi: mpi3mr: Add framework to issue MPT transport cmds")
Acked-by: default avatarSathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 32e7e06f

drivers/scsi/mpi3mr/mpi3mr_transport.c

+32 −26
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc, 
	u16 request_sz = sizeof(struct mpi3_smp_passthrough_request);

	u16 reply_sz = sizeof(struct mpi3_smp_passthrough_reply);

	u16 ioc_status;

	u8 *tmp;



	if (mrioc->reset_in_progress) {

		ioc_err(mrioc, "%s: host reset in progress!\n", __func__);
@@ -186,24 +187,30 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc, 
	    "sending report manufacturer SMP request to sas_address(0x%016llx), port(%d)\n",

	    (unsigned long long)sas_address, port_id);



	if (mpi3mr_post_transport_req(mrioc, &mpi_request, request_sz,

	    &mpi_reply, reply_sz, MPI3MR_INTADMCMD_TIMEOUT, &ioc_status))

	rc = mpi3mr_post_transport_req(mrioc, &mpi_request, request_sz,

				       &mpi_reply, reply_sz,

				       MPI3MR_INTADMCMD_TIMEOUT, &ioc_status);

	if (rc)

		goto out;



	dprint_transport_info(mrioc,

	    "report manufacturer SMP request completed with ioc_status(0x%04x)\n",

	    ioc_status);



	if (ioc_status == MPI3_IOCSTATUS_SUCCESS) {

		u8 *tmp;

	if (ioc_status != MPI3_IOCSTATUS_SUCCESS) {

		rc = -EINVAL;

		goto out;

	}



	dprint_transport_info(mrioc,

	    "report manufacturer - reply data transfer size(%d)\n",

	    le16_to_cpu(mpi_reply.response_data_length));



	if (le16_to_cpu(mpi_reply.response_data_length) !=

		    sizeof(struct rep_manu_reply))

	    sizeof(struct rep_manu_reply)) {

		rc = -EINVAL;

		goto out;

	}



	strscpy(edev->vendor_id, manufacture_reply->vendor_id,

	     SAS_EXPANDER_VENDOR_ID_LEN);
@@ -221,7 +228,6 @@ static int mpi3mr_report_manufacture(struct mpi3mr_ioc *mrioc, 
		edev->component_revision_id =

		    manufacture_reply->component_revision_id;

	}

	}



out:

	if (data_out)