From: Guan Junxiong <guanjunxiong@huawei.com>
Date: Thu, 3 Aug 2017 13:38:16 +0000 (+0800)
Subject: nvme-cli: fix connecting failure due to invalid uuid format of hostid
X-Git-Tag: v1.4~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0832d06cd62d3541489a3b74e6280b6b68522880;p=users%2Fsagi%2Fnvme-cli.git

nvme-cli: fix connecting failure due to invalid uuid format of hostid

When we connect or discover a target with --hostid option via the
/etc/nvme/hostid file, we fails this operation because the hostid
is only 35 not 36 bytes which doesn't pass the uuid checking in the
kernel.The last character is overridden with null bytes because fgets
reads at most one less than sizeof of buffer characters.

Signed-off-by: Guan Junxiong <guanjunxiong@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/fabrics.c b/fabrics.c
index da4e04eb..9ed11274 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -463,7 +463,7 @@ out:
 static int nvmf_hostid_file(void)
 {
 	FILE *f;
-	char hostid[NVMF_HOSTID_SIZE];
+	char hostid[NVMF_HOSTID_SIZE + 1];
 	int ret = false;
 
 	f = fopen(PATH_NVMF_HOSTID, "r");