nvme: plot eye chart data and hex dumping VS eye data

-Addressing review comments
-Added checks for memory leaks

Signed-off-by: Sivaprasad Gutha <sivaprasad6541@gmail.com>

Author: sivaprasad6541

nvme-print-json.c

@@ -2128,11 +2128,14 @@ static char *json_eom_printable_eye(struct nvme_eom_lane_desc *lane,
 	uint16_t ncols = le16_to_cpu(lane->ncols);
 	char *printable = NULL;
 	char *printable_start = NULL;
-	struct json_object *eye_array = json_create_array();
+	struct json_object *eye_array = NULL;
 
 	if (nrows == 0 || ncols == 0)
 		return NULL;
 
+	eye_array = json_create_array();
+	if (!eye_array)
+		return NULL;
 	/*
 	 * Allocate buffer for full printable string (with newlines)
 	 * +1 for null terminator
@@ -2141,21 +2144,13 @@ static char *json_eom_printable_eye(struct nvme_eom_lane_desc *lane,
 	printable_start = printable;
 
 	if (!printable)
-		return NULL;
-
-	if (!eye_array) {
-		free(printable);
-		return NULL;
-	}
+		goto fail_free_eye_array;
 
 	for (int i = 0; i < nrows; i++) {
 		char *row = malloc(ncols + 1);
 
-		if (!row) {
-			/* Cleanup on failure */
-			free(printable_start);
-			return NULL;
-		}
+		if (!row)
+			goto fail_free_eye_printable;
 
 		for (int j = 0; j < ncols; j++) {
 			char ch = eye[i * ncols + j];
@@ -2175,6 +2170,13 @@ static char *json_eom_printable_eye(struct nvme_eom_lane_desc *lane,
 	obj_add_array(r, "printable_eye", eye_array);
 
 	return printable_start;
+
+fail_free_eye_printable:
+	free(printable);
+fail_free_eye_array:
+	json_free_object(eye_array);
+
+	return NULL;
 }
 
 static void json_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log,
@@ -2189,12 +2191,20 @@ static void json_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log,
 
 	for (i = 0; i < num_descs; i++) {
 		struct nvme_eom_lane_desc *desc = p;
+		_cleanup_free_ char *hexstr = NULL;
 		unsigned char *vsdata = NULL;
 		unsigned int vsdataoffset = 0;
-		struct json_object *jdesc = json_create_object();
-		uint16_t nrows = le16_to_cpu(desc->nrows);
-		uint16_t ncols = le16_to_cpu(desc->ncols);
-		uint16_t edlen = le16_to_cpu(desc->edlen);
+		uint16_t nrows, ncols, edlen;
+		struct json_object *jdesc;
+		char *hexdata;
+
+		jdesc = json_create_object();
+		if (!desc)
+			return;
+
+		nrows = le16_to_cpu(desc->nrows);
+		ncols = le16_to_cpu(desc->ncols);
+		edlen = le16_to_cpu(desc->edlen);
 
 		obj_add_uint(jdesc, "lid", desc->mstatus);
 		obj_add_uint(jdesc, "lane", desc->lane);
@@ -2214,16 +2224,18 @@ static void json_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log,
 			continue;
 
 		/* 2 hex chars + space per byte */
-		_cleanup_free_ char *hexstr = malloc(edlen * 3 + 1);
+		hexstr = malloc(edlen * 3 + 1);
 
-		if (!hexstr)
+		if (!hexstr) {
+			json_free_object(jdesc);
 			return;
+		}
 
 		/* Hex dump Vendor Specific Eye Data */
 		vsdataoffset = (nrows * ncols) + sizeof(struct nvme_eom_lane_desc);
 		vsdata = (unsigned char *)((unsigned char *)desc + vsdataoffset);
 
-		char *hexdata = hexstr;
+		hexdata = hexstr;
 
 		for (int offset = 0; offset < edlen; offset++)
 			hexdata += sprintf(hexdata, "%02X ", vsdata[offset]);

nvme-print-stdout.c

@@ -792,9 +792,11 @@ static void stdout_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log)
 		struct nvme_eom_lane_desc *desc = p;
 		unsigned char *vsdata = NULL;
 		unsigned int vsdataoffset = 0;
-		uint16_t nrows = le16_to_cpu(desc->nrows);
-		uint16_t ncols = le16_to_cpu(desc->ncols);
-		uint16_t edlen = le16_to_cpu(desc->edlen);
+		uint16_t nrows, ncols, edlen;
+
+		nrows = le16_to_cpu(desc->nrows);
+		ncols = le16_to_cpu(desc->ncols);
+		edlen = le16_to_cpu(desc->edlen);
 
 		printf("Measurement Status: %s\n",
 			desc->mstatus ? "Successful" : "Not Successful");
@@ -817,11 +819,15 @@ static void stdout_phy_rx_eom_descs(struct nvme_phy_rx_eom_log *log)
 
 		/* Hex dump Vendor Specific Eye Data */
 		vsdata = malloc(edlen);
+		if (!vsdata)
+			return;
+
 		vsdataoffset = (nrows * ncols) + sizeof(struct nvme_eom_lane_desc);
 		vsdata = (unsigned char *)((unsigned char *)desc + vsdataoffset);
 		printf("Eye Data:\n");
 		d(vsdata, edlen, 16, 1);
 		printf("\n");
+		free(vsdata);
 
 		p += log->dsize;
 	}