nvme-fabrics: fix I/O connect error handling

Chaitanya Kulkarni · keithbusch · commit 79bd7eab8366 · 2024-02-13T08:16:10.000-08:00
In nvmf_connect_io_queue(), if connect I/O command fails, we log the error and continue for authentication. This overrides error captured from __nvme_submit_sync_cmd(), causing wrong return value. Add goto out_free_data after logging connect error to fix the issue. Fixes: f50fff7 ("nvme: implement In-Band authentication") Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
@@ -534,6 +534,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)
 	if (ret) {
 		nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),
 				       &cmd, data);
+		goto out_free_data;
 	}
 	result = le32_to_cpu(res.u32);
 	if (result & (NVME_CONNECT_AUTHREQ_ATR | NVME_CONNECT_AUTHREQ_ASCR)) {

Original file line number	Diff line number	Diff line change
`@@ -534,6 +534,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid)`
`534`	`534`	`if (ret) {`
`535`	`535`	`nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),`
`536`	`536`	`&cmd, data);`
	`537`	`+ goto out_free_data;`
`537`	`538`	`}`
`538`	`539`	`result = le32_to_cpu(res.u32);`
`539`	`540`	`if (result & (NVME_CONNECT_AUTHREQ_ATR \| NVME_CONNECT_AUTHREQ_ASCR)) {`