From: Aaron Miller <aaronmiller@fb.com>
Date: Fri, 9 Dec 2016 23:11:28 +0000 (-0800)
Subject: Fix handling of Firmware field in JSON output
X-Git-Tag: v1.1~9^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ccf857a0e900462fb8c22d43c1a76e19048da37;p=users%2Fsagi%2Fnvme-cli.git

Fix handling of Firmware field in JSON output

This was not checking the sizeof() of the .fr field and could read past
the end of it.
---

diff --git a/nvme-print.c b/nvme-print.c
index 1f00b07f..ddfabcdf 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -1151,9 +1151,14 @@ void json_print_list_items(struct list_item *list_items, unsigned len)
 		json_object_add_value_string(device_attrs,
 					     "DevicePath",
 					     list_items[i].node);
+
+		format(formatter, sizeof(formatter),
+			   list_items[i].ctrl.fr,
+			   sizeof(list_items[i].ctrl.fr));
+
 		json_object_add_value_string(device_attrs,
 					     "Firmware",
-					     list_items[i].ctrl.fr);
+					     formatter);
 
 		if (sscanf(list_items[i].node, "/dev/nvme%d", &index) == 1)
 			json_object_add_value_int(device_attrs,