scsi: lpfc: Fix prli_fc4_req checks in PRLI handling
authorJames Smart <jsmart2021@gmail.com>
Sun, 11 Sep 2022 22:14:53 +0000 (15:14 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 16 Sep 2022 02:18:26 +0000 (22:18 -0400)
The if statment check (prli_fc4_req & PRLI_NVME_TYPE) evaluates to true
when receiving a PRLI request for bogus FC4 type codes that happen to have
the 3rd or 5th bit set because PRLI_NVME_TYPE is 0x28.  This leads to
sending a PRLI_NVME_ACC even for bogus FC4 type codes.

Change the bitwise & check to an exact == type code check to ensure we send
PRLI_NVME_ACC only for NVME type coded PRLI requests.

Link: https://lore.kernel.org/r/20220911221505.117655-2-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/lpfc/lpfc_els.c

index 9e69de9eb9923ff163fea3307de731f87b58b3b8..4c372553e2aa79d288dec9a3ec3e711c6cab3568 100644 (file)
@@ -6006,7 +6006,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
        if (prli_fc4_req == PRLI_FCP_TYPE) {
                cmdsize = sizeof(uint32_t) + sizeof(PRLI);
                elsrspcmd = (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK));
-       } else if (prli_fc4_req & PRLI_NVME_TYPE) {
+       } else if (prli_fc4_req == PRLI_NVME_TYPE) {
                cmdsize = sizeof(uint32_t) + sizeof(struct lpfc_nvme_prli);
                elsrspcmd = (ELS_CMD_ACC | (ELS_CMD_NVMEPRLI & ~ELS_RSP_MASK));
        } else {
@@ -6069,7 +6069,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
                npr->ConfmComplAllowed = 1;
                npr->prliType = PRLI_FCP_TYPE;
                npr->initiatorFunc = 1;
-       } else if (prli_fc4_req & PRLI_NVME_TYPE) {
+       } else if (prli_fc4_req == PRLI_NVME_TYPE) {
                /* Respond with an NVME PRLI Type */
                npr_nvme = (struct lpfc_nvme_prli *) pcmd;
                bf_set(prli_type_code, npr_nvme, PRLI_NVME_TYPE);