From: jsmart2021@gmail.com (jsmart2021@gmail.com)
Subject: [PATCH 4/6] nvme_fc: correct LS validation
Date: Thu, 23 Mar 2017 20:41:25 -0700 [thread overview]
Message-ID: <20170324034127.8676-5-jsmart2021@gmail.com> (raw)
In-Reply-To: <20170324034127.8676-1-jsmart2021@gmail.com>
From: James Smart <jsmart2021@gmail.com>
LS validations shouldn't have been independent checks.
Signed-off-by: James Smart <james.smart at broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
---
drivers/nvme/host/fc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 7b8989a..aab2fe5 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -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)))
--
2.9.3
next prev parent reply other threads:[~2017-03-24 3:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-24 3:41 [PATCH 0/6] nvme_fc: repost spec updates and fixes jsmart2021
2017-03-24 3:41 ` [PATCH 1/6] nvme_fc: Sync FC-NVME header with standard jsmart2021
2017-03-27 9:53 ` Christoph Hellwig
2017-03-24 3:41 ` [PATCH 2/6] nvme_fc: Add check of status_code in ERSP_IU jsmart2021
2017-03-27 9:53 ` Christoph Hellwig
2017-03-24 3:41 ` [PATCH 3/6] nvmet_fc: Sync NVME LS reject reasons with spec jsmart2021
2017-03-27 9:53 ` Christoph Hellwig
2017-03-24 3:41 ` jsmart2021 [this message]
2017-03-27 9:54 ` [PATCH 4/6] nvme_fc: correct LS validation Christoph Hellwig
2017-03-24 3:41 ` [PATCH 5/6] nvmet_fc: Clear SG list to avoid double frees jsmart2021
2017-03-27 9:54 ` Christoph Hellwig
2017-03-24 3:41 ` [PATCH 6/6] nvme_fc: Clean up host fcpio done status handling jsmart2021
2017-03-27 9:54 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170324034127.8676-5-jsmart2021@gmail.com \
--to=jsmart2021@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).