Commit 1401fcc4 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme-loop: don't put ctrl on nvme_init_ctrl error 



The function nvme_init_ctrl() gets the ctrl reference & when it fails it
does put the ctrl reference in the error unwind code.

When creating loop ctrl in nvme_loop_create_ctrl() if nvme_init_ctrl()
returns non zero (i.e. error) value it jumps to the "out_put_ctrl" label
which calls nvme_put_ctrl(), that will lead to douple ctrl put in error
unwind path.

Update nvme_loop_create_ctrl() such that this patch removes the
"out_put_ctrl" label, add a new "out" label after nvme_put_ctrl() in
error unwind path and jump to newly added label when nvme_init_ctrl()
call retuns an error.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 103fbf8e

drivers/nvme/target/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
	ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_loop_ctrl_ops,

				0 /* no quirks, we're perfect! */);

	if (ret)

		goto out_put_ctrl;

		goto out;



	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING))

		WARN_ON_ONCE(1);
@@ -635,8 +635,8 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
	kfree(ctrl->queues);

out_uninit_ctrl:

	nvme_uninit_ctrl(&ctrl->ctrl);

out_put_ctrl:

	nvme_put_ctrl(&ctrl->ctrl);

out:

	if (ret > 0)

		ret = -EIO;

	return ERR_PTR(ret);