* [PATCH] nvme: Fix NULL pointer dereference in nvme_init_subsystem
@ 2018-06-10 10:31 Israel Rukshin
2018-06-11 14:27 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Israel Rukshin @ 2018-06-10 10:31 UTC (permalink / raw)
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 at mellanox.com>
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
---
drivers/nvme/host/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c8b3006..0ab4c7a 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",
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] nvme: Fix NULL pointer dereference in nvme_init_subsystem
2018-06-10 10:31 [PATCH] nvme: Fix NULL pointer dereference in nvme_init_subsystem Israel Rukshin
@ 2018-06-11 14:27 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2018-06-11 14:27 UTC (permalink / raw)
Thanks,
applied to nvme-4.18.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-11 14:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-10 10:31 [PATCH] nvme: Fix NULL pointer dereference in nvme_init_subsystem Israel Rukshin
2018-06-11 14:27 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox