From b31d31b22b089b8b523eb5d52ccef7a71f4620f9 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 18 Apr 2018 13:34:49 -0700 Subject: [PATCH] vhost: Check for null pointers in vhost_blk This fixes two flagged Klocwork issues. Change-Id: I98ac136995ebcdc89aa94c76fec095573e102674 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/408237 Tested-by: SPDK Automated Test System Reviewed-by: Changpeng Liu Reviewed-by: Daniel Verkamp --- lib/vhost/vhost_blk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c index 9cbd6c8ab..f814fe98e 100644 --- a/lib/vhost/vhost_blk.c +++ b/lib/vhost/vhost_blk.c @@ -598,7 +598,12 @@ static void spdk_vhost_blk_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ctx *w) { struct spdk_bdev *bdev = spdk_vhost_blk_get_dev(vdev); - struct spdk_vhost_blk_dev *bvdev = to_blk_dev(vdev); + struct spdk_vhost_blk_dev *bvdev; + + bvdev = to_blk_dev(vdev); + if (bvdev == NULL) { + return; + } assert(bvdev != NULL); spdk_json_write_name(w, "block"); @@ -620,7 +625,12 @@ spdk_vhost_blk_dump_info_json(struct spdk_vhost_dev *vdev, struct spdk_json_writ static void spdk_vhost_blk_write_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ctx *w) { - struct spdk_vhost_blk_dev *bvdev = to_blk_dev(vdev); + struct spdk_vhost_blk_dev *bvdev; + + bvdev = to_blk_dev(vdev); + if (bvdev == NULL) { + return; + } if (!bvdev->bdev) { return;