From: Keith Busch <keith.busch@intel.com>
Date: Tue, 6 Dec 2016 22:36:32 +0000 (-0700)
Subject: Fix segfault listing models
X-Git-Tag: v1.1~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=44c7aa9fa5b64641f00f3f5c91dde60c75786af1;p=users%2Fsagi%2Fnvme-cli.git

Fix segfault listing models

The models strings may not exist in the place this program thinks it
does. Check if the file is valid before reading from it, and return an
apporpriate string accordingly.

https://github.com/linux-nvme/nvme-cli/issues/140

Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/nvme-models.c b/nvme-models.c
index c607b767..e55e7b07 100644
--- a/nvme-models.c
+++ b/nvme-models.c
@@ -249,6 +249,9 @@ char *nvme_product_name(int id)
 	size_t size = 1024;
 	char ret;
 
+	if (!file)
+		goto error1;
+
 	snprintf(fmt1, 78, _fmt1, id);
 	snprintf(fmt2, 78, _fmt2, id);
 	snprintf(fmt3, 78, _fmt3, id);