nvme-print: fix offset calculation in NS ID Descriptor list

The offset for the next entry in the list is based on the length (len)
of the previous entry, but len is erroneously accumulated instead of
being set. This works fine for the first and second entry in the list
but will fail to reach the correct offset for the 3rd entry and beyond.

Signed-off-by: Saar Gross <saarg@amazon.com>

diff --git a/nvme-print.c b/nvme-print.c
index 51f884917c52fa0ce2e27428ba999bd568638c41..dc491cf6c7da92fefe8d1ae8847a46db3fe8fb76 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -2537,7 +2537,7 @@ static void json_nvme_id_ns_descs(void *data)
                        memcpy(desc.eui64, data + off, sizeof(desc.eui64));
                        for (i = 0; i < sizeof(desc.eui64); i++)
                                json_str_p += sprintf(json_str_p, "%02x", desc.eui64[i]);
-                       len += sizeof(desc.eui64);
+                       len = sizeof(desc.eui64);
                        nidt_name = "eui64";
                        break;
 
@@ -2545,7 +2545,7 @@ static void json_nvme_id_ns_descs(void *data)
                        memcpy(desc.nguid, data + off, sizeof(desc.nguid));
                        for (i = 0; i < sizeof(desc.nguid); i++)
                                json_str_p += sprintf(json_str_p, "%02x", desc.nguid[i]);
-                       len += sizeof(desc.nguid);
+                       len = sizeof(desc.nguid);
                        nidt_name = "nguid";
                        break;
 
@@ -2553,7 +2553,7 @@ static void json_nvme_id_ns_descs(void *data)
                case NVME_NIDT_UUID:
                        memcpy(desc.uuid, data + off, sizeof(desc.uuid));
                        uuid_unparse_lower(desc.uuid, json_str);
-                       len += sizeof(desc.uuid);
+                       len = sizeof(desc.uuid);
                        nidt_name = "uuid";
                        break;
 #endif