From c1f7f02cfefbd2a2e7c860b41913cd67f50ebfe1 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Wed, 18 Apr 2018 13:40:51 -0700
Subject: [PATCH] vhost: Handle null pointer when dumping SCSI JSON config

Change-Id: I4bec75ee2965394edb294a163818925e6a26fb0c
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/408239
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/vhost/vhost_scsi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c
index 20f9b82cb..23c45b1f6 100644
--- a/lib/vhost/vhost_scsi.c
+++ b/lib/vhost/vhost_scsi.c
@@ -1228,10 +1228,15 @@ spdk_vhost_scsi_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_wri
 static void
 spdk_vhost_scsi_write_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ctx *w)
 {
-	struct spdk_vhost_scsi_dev *svdev = to_scsi_dev(vdev);
+	struct spdk_vhost_scsi_dev *svdev;
 	struct spdk_scsi_lun *lun;
 	uint32_t i;
 
+	svdev = to_scsi_dev(vdev);
+	if (!svdev) {
+		return;
+	}
+
 	spdk_json_write_object_begin(w);
 	spdk_json_write_named_string(w, "method", "construct_vhost_scsi_controller");