|
 |
1b38b6 |
From 59e7477c5a18ec4bcb1f9b1e20d2303b4e0cafb1 Mon Sep 17 00:00:00 2001
|
|
|
1b38b6 |
From: Martin George <marting@netapp.com>
|
|
|
1b38b6 |
Date: Thu, 5 Aug 2021 18:01:24 +0530
|
|
|
1b38b6 |
Subject: [PATCH] nvme-print: fix 'nvme list' segfault if controller is
|
|
|
1b38b6 |
unavailable
|
|
|
1b38b6 |
|
|
|
1b38b6 |
Check if the controller is available before dereferencing the
|
|
|
1b38b6 |
controller attributes.
|
|
|
1b38b6 |
|
|
|
1b38b6 |
Signed-off-by: Martin George <marting@netapp.com>
|
|
|
1b38b6 |
---
|
|
|
1b38b6 |
nvme-print.c | 9 +++++++++
|
|
|
1b38b6 |
1 file changed, 9 insertions(+)
|
|
|
1b38b6 |
|
|
|
1b38b6 |
diff --git a/nvme-print.c b/nvme-print.c
|
|
|
1b38b6 |
index 8a2cbc4..0c0ec3b 100755
|
|
|
1b38b6 |
--- a/nvme-print.c
|
|
|
1b38b6 |
+++ b/nvme-print.c
|
|
|
1b38b6 |
@@ -6147,6 +6147,9 @@ static void nvme_show_list_item(struct nvme_namespace *n)
|
|
|
1b38b6 |
struct stat st;
|
|
|
1b38b6 |
int ret;
|
|
|
1b38b6 |
|
|
|
1b38b6 |
+ if (!n->ctrl)
|
|
|
1b38b6 |
+ return;
|
|
|
1b38b6 |
+
|
|
|
1b38b6 |
sprintf(path, "%s%s", n->ctrl->path, n->name);
|
|
|
1b38b6 |
ret = stat(path, &st);
|
|
|
1b38b6 |
if (ret < 0)
|
|
|
1b38b6 |
@@ -6203,6 +6206,9 @@ static void nvme_show_details_ns(struct nvme_namespace *n, bool ctrl)
|
|
|
1b38b6 |
char usage[128];
|
|
|
1b38b6 |
char format[128];
|
|
|
1b38b6 |
|
|
|
1b38b6 |
+ if (!n->ctrl)
|
|
|
1b38b6 |
+ return;
|
|
|
1b38b6 |
+
|
|
|
1b38b6 |
sprintf(usage,"%6.2f %2sB / %6.2f %2sB", nuse, u_suffix,
|
|
|
1b38b6 |
nsze, s_suffix);
|
|
|
1b38b6 |
sprintf(format,"%3.0f %2sB + %2d B", (double)lba, l_suffix,
|
|
|
1b38b6 |
@@ -6419,6 +6425,9 @@ static void json_simple_ns(struct nvme_namespace *n, struct json_object *devices
|
|
|
1b38b6 |
char *devnode;
|
|
|
1b38b6 |
struct stat st;
|
|
|
1b38b6 |
|
|
|
1b38b6 |
+ if (!n->ctrl)
|
|
|
1b38b6 |
+ return;
|
|
|
1b38b6 |
+
|
|
|
1b38b6 |
if (asprintf(&devnode, "%s%s", n->ctrl->path, n->name) < 0)
|
|
|
1b38b6 |
return;
|
|
|
1b38b6 |
|
|
|
1b38b6 |
--
|
|
|
1b38b6 |
2.27.0
|
|
|
1b38b6 |
|