Commit c4963dbe authored by Justin Tee's avatar Justin Tee Committed by Zheng Qixing
Browse files

scsi: lpfc: Handle mailbox timeouts in lpfc_get_sfp_info 

mainline inclusion
from mainline-v6.11-rc1
commit ede596b1434b57c0b3fd5c02b326efe5c54f6e48
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9N8
CVE: CVE-2024-46842

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ede596b1434b57c0b3fd5c02b326efe5c54f6e48



--------------------------------

The MBX_TIMEOUT return code is not handled in lpfc_get_sfp_info and the
routine unconditionally frees submitted mailbox commands regardless of
return status.  The issue is that for MBX_TIMEOUT cases, when firmware
returns SFP information at a later time, that same mailbox memory region
references previously freed memory in its cmpl routine.

Fix by adding checks for the MBX_TIMEOUT return code.  During mailbox
resource cleanup, check the mbox flag to make sure that the wait did not
timeout.  If the MBOX_WAKE flag is not set, then do not free the resources
because it will be freed when firmware completes the mailbox at a later
time in its cmpl routine.

Also, increase the timeout from 30 to 60 seconds to accommodate boot
scripts requiring longer timeouts.

Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20240628172011.25921-6-justintee8345@gmail.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Conflicts:
	drivers/scsi/lpfc/lpfc_els.c
[The conflict here is due to inconsistencies in the context caused by
18f7fe44bc79 ("scsi: lpfc: Define lpfc_nodelist type for ctx_ndlp ptr").]

Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent 02590a1a

drivers/scsi/lpfc/lpfc_els.c

+11 −6
Original line number Diff line number Diff line
@@ -7304,13 +7304,13 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba, 
	}

	mbox->vport = phba->pport;

	mbox->ctx_ndlp = (struct lpfc_rdp_context *)rdp_context;



	rc = lpfc_sli_issue_mbox_wait(phba, mbox, 30);

	rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_SLI4_CONFIG_TMO);

	if (rc == MBX_NOT_FINISHED) {

		rc = 1;

		goto error;

	}



	if (rc == MBX_TIMEOUT)

		goto error;

	if (phba->sli_rev == LPFC_SLI_REV4)

		mp = (struct lpfc_dmabuf *)(mbox->ctx_buf);

	else
@@ -7364,7 +7364,10 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba, 
	}



	mbox->ctx_ndlp = (struct lpfc_rdp_context *)rdp_context;

	rc = lpfc_sli_issue_mbox_wait(phba, mbox, 30);

	rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_SLI4_CONFIG_TMO);



	if (rc == MBX_TIMEOUT)

		goto error;

	if (bf_get(lpfc_mqe_status, &mbox->u.mqe)) {

		rc = 1;

		goto error;
@@ -7375,8 +7378,10 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba, 
			     DMP_SFF_PAGE_A2_SIZE);



error:

	if (mbox->mbox_flag & LPFC_MBX_WAKE) {

		mbox->ctx_buf = mpsave;

		lpfc_mbox_rsrc_cleanup(phba, mbox, MBOX_THD_UNLOCKED);

	}



	return rc;