Commit 0b5a7669 authored Jun 15, 2017 by James Smart Committed by Jens Axboe Jun 28, 2017

nvme_fc: Fix crash when nvme controller connection fails.



If a controller connection is attempted (say to a subsystem that
does not exist), the first attempt errors out.  If another connect
is attempted, it crashes.

Issue is the prior controller has yet execute it's final put, thus
its still on lists. However, opts points on it have been cleared, thus
causing the crash if they are referenced.

Fix is to add the missing put after the nvme_uninit_ctrl() call on
the attachment failure.

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

parent 36715cf4

drivers/nvme/host/fc.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2764,6 +2764,9 @@ nvme_fc_init_ctrl(struct device dev, struct nvmf_ctrl_options opts,
	nvme_uninit_ctrl(&ctrl->ctrl);		nvme_uninit_ctrl(&ctrl->ctrl);
	nvme_put_ctrl(&ctrl->ctrl);		nvme_put_ctrl(&ctrl->ctrl);

			/* Remove core ctrl ref. */
			nvme_put_ctrl(&ctrl->ctrl);

	/* as we're past the point where we transition to the ref		/* as we're past the point where we transition to the ref
	* counting teardown path, if we return a bad pointer here,		* counting teardown path, if we return a bad pointer here,
	* the calling routine, thinking it's prior to the		* the calling routine, thinking it's prior to the

Admin message