diff options
| author |   Israel Rukshin <israelr@mellanox.com> | 2018-06-10 10:31:10 +0000 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2018-06-11 16:17:41 +0200 |
| commit | 16001c10725e11b73b8518f42e414506bf73c291 (patch) | |
| tree | f24a46cc72411e71324c7f83951e0dfb93d57a99 /drivers/nvme | |
| parent | block: fix use-after-free in block flush handling (diff) | |
| download | linux-dev-16001c10725e11b73b8518f42e414506bf73c291.tar.xz linux-dev-16001c10725e11b73b8518f42e414506bf73c291.zip | |
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index e2dcd14012b1..d6ca4598c027 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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", |