Commit 188f7e8a authored Jun 15, 2017 by James Smart Committed by Jens Axboe Jun 28, 2017

nvmet_fc: fix crashes on bad opcodes



if a nvme command is issued with an opcode that is not supported by
the target (example: opcode 21 - detach namespace), the target
crashes due to a null pointer.

nvmet_req_init() detects the bad opcode and immediately calls the nvme
command done routine with an error status, allowing the transport to
send the response. However, the FC transport was aborting the command
on error, so the abort freed the lldd point, but the rsp transmit path
referenced it psot the free.

Fix by removing the abort call on nvmet_req_init() failure.
The completion response will be sent with an error status code.

As the completion path will terminate the io, ensure the data_sg
lists show an unused state so that teardown paths are successful.

Signed-off-by: Paul Ely <Paul.Ely@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 0b5a7669

drivers/nvme/target/fc.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -2096,20 +2096,22 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport,
		/* clear any response payload */
		memset(&fod->rspiubuf, 0, sizeof(fod->rspiubuf));

		fod->data_sg = NULL;
		fod->data_sg_cnt = 0;

		ret = nvmet_req_init(&fod->req,
		&fod->queue->nvme_cq,
		&fod->queue->nvme_sq,
		&nvmet_fc_tgt_fcp_ops);
		if (!ret) { /* bad SQE content or invalid ctrl state */
		nvmet_fc_abort_op(tgtport, fod);
		if (!ret) {
		/* bad SQE content or invalid ctrl state */
		/* nvmet layer has already called op done to send rsp. */
		return;
		}

		/* keep a running counter of tail position */
		atomic_inc(&fod->queue->sqtail);

		fod->data_sg = NULL;
		fod->data_sg_cnt = 0;
		if (fod->total_length) {
		ret = nvmet_fc_alloc_tgt_pgs(fod);
		if (ret) {

Admin message