From: Hannes Reinecke <hare@suse.de>
Date: Thu, 12 Aug 2021 09:28:31 +0000 (+0200)
Subject: tree: avoid crash on unset subsystem in nvme_ctrl_get_host{nqn,id}
X-Git-Tag: v1.0-rc0~113^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56255757be29a30ef0bf537783828c858796ad53;p=users%2Fsagi%2Flibnvme.git

tree: avoid crash on unset subsystem in nvme_ctrl_get_host{nqn,id}

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index 2c8192fd..6bcaf035 100644
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -652,14 +652,14 @@ const char *nvme_ctrl_get_host_iface(nvme_ctrl_t c)
 
 const char *nvme_ctrl_get_hostnqn(nvme_ctrl_t c)
 {
-	if (!c->s)
+	if (!c->s || !c->s->h)
 		return default_host->hostnqn;
 	return c->s->h->hostnqn;
 }
 
 const char *nvme_ctrl_get_hostid(nvme_ctrl_t c)
 {
-	if (!c->s)
+	if (!c->s || !c->s->h)
 		return default_host->hostid;
 	return c->s->h->hostid;
 }