Commit 16001c10 authored Jun 10, 2018 by Israel Rukshin Committed by Christoph Hellwig Jun 11, 2018

nvme: fix NULL pointer dereference in nvme_init_subsystem



When using nvme-pci driver the nvmf_ctrl_options is NULL.
There is no need to check for discovery_nqn flag at non-fabrics controller.

Fixes: 181303d0 ("nvme-fabrics: allow duplicate connections to the discovery controller")
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 190b02ed

drivers/nvme/host/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2208,7 +2208,7 @@ static int nvme_init_subsystem(struct nvme_ctrl ctrl, struct nvme_id_ctrl id)
		* Verify that the subsystem actually supports multiple
		* controllers, else bail out.
		*/
		if (!ctrl->opts->discovery_nqn &&
		if (!(ctrl->opts && ctrl->opts->discovery_nqn) &&
		nvme_active_ctrls(found) && !(id->cmic & (1 << 1))) {
		dev_err(ctrl->device,
		"ignoring ctrl due to duplicate subnqn (%s).\n",