From: Andy Lutomirski <luto@kernel.org>
Date: Thu, 1 Sep 2016 15:27:48 +0000 (-0700)
Subject: get-features: Don't try to read the data buffer for sel == 3
X-Git-Tag: v1.2~30^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8876353b73a3fbadf51978ed3ec630b3ac1d23f2;p=users%2Fsagi%2Fnvme-cli.git

get-features: Don't try to read the data buffer for sel == 3

When sel == 3, the controller returns capabilities in the completion
entry and does not produce a feature value blob.  Stop allocating
space for the blob and displaying it -- the result is garbage.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
---

diff --git a/nvme.c b/nvme.c
index 24fdce95..00a64669 100644
--- a/nvme.c
+++ b/nvme.c
@@ -1119,6 +1119,9 @@ static int get_feature(int argc, char **argv, struct command *cmd, struct plugin
 		cfg.data_len = 8;
 		break;
 	}
+
+	if (cfg.sel == 3)
+		cfg.data_len = 0;
 	
 	if (cfg.data_len) {
 		if (posix_memalign(&buf, getpagesize(), cfg.data_len)) {
@@ -1135,7 +1138,7 @@ static int get_feature(int argc, char **argv, struct command *cmd, struct plugin
 			printf("get-feature:%#02x (%s), %s value:%#08x\n", cfg.feature_id,
 				nvme_feature_to_string(cfg.feature_id),
 				nvme_select_to_string(cfg.sel), result);
-			if (cfg.human_readable)
+			if (cfg.human_readable && buf)
 				nvme_feature_show_fields(cfg.feature_id, result, buf);
 			else if (buf)
 				d(buf, cfg.data_len, 16, 1);