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

Commit f77fc87c authored by James Smart's avatar James Smart Committed by Jens Axboe
Browse files

nvme_fc: correct LS validation 



LS validations shouldn't have been independent checks.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4083aa98

drivers/nvme/host/fc.c

+5 −4
Original line number Diff line number Diff line
@@ -848,11 +848,12 @@ nvme_fc_connect_admin_queue(struct nvme_fc_ctrl *ctrl, 
	/* validate the ACC response */

	if (assoc_acc->hdr.w0.ls_cmd != FCNVME_LS_ACC)

		fcret = VERR_LSACC;

	if (assoc_acc->hdr.desc_list_len !=

	else if (assoc_acc->hdr.desc_list_len !=

			fcnvme_lsdesc_len(

				sizeof(struct fcnvme_ls_cr_assoc_acc)))

		fcret = VERR_CR_ASSOC_ACC_LEN;

	if (assoc_acc->hdr.rqst.desc_tag != cpu_to_be32(FCNVME_LSDESC_RQST))

	else if (assoc_acc->hdr.rqst.desc_tag !=

			cpu_to_be32(FCNVME_LSDESC_RQST))

		fcret = VERR_LSDESC_RQST;

	else if (assoc_acc->hdr.rqst.desc_len !=

			fcnvme_lsdesc_len(sizeof(struct fcnvme_lsdesc_rqst)))
@@ -955,10 +956,10 @@ nvme_fc_connect_queue(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue, 
	/* validate the ACC response */

	if (conn_acc->hdr.w0.ls_cmd != FCNVME_LS_ACC)

		fcret = VERR_LSACC;

	if (conn_acc->hdr.desc_list_len !=

	else if (conn_acc->hdr.desc_list_len !=

			fcnvme_lsdesc_len(sizeof(struct fcnvme_ls_cr_conn_acc)))

		fcret = VERR_CR_CONN_ACC_LEN;

	if (conn_acc->hdr.rqst.desc_tag != cpu_to_be32(FCNVME_LSDESC_RQST))

	else if (conn_acc->hdr.rqst.desc_tag != cpu_to_be32(FCNVME_LSDESC_RQST))

		fcret = VERR_LSDESC_RQST;

	else if (conn_acc->hdr.rqst.desc_len !=

			fcnvme_lsdesc_len(sizeof(struct fcnvme_lsdesc_rqst)))