ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: fix vhost_blk_destroy issue

Browse Source 
If the vhost dev can't unregister successfully then we
leave the io channel and desc. In the bdev remove callback
we will free them or It would cause heap-use-after-free
issue.

Fix github issue: #1443

Change-Id: I09f4616e181d6657add3acef0ff92336fb9a9643
Signed-off-by: Jin Yu <jin.yu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2924
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: <dongx.yi@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jin Yu 2020-06-18 03:34:24 +08:00 committed by Tomasz Zawadzki
parent a37fd6e03d
commit 4539ac58ae
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vhost/vhost_blk.c
View File

@ -1280,16 +1280,16 @@ vhost_blk_destroy(struct spdk_vhost_dev *vdev)
assert(bvdev != NULL); assert(bvdev != NULL);
/* if the bdev is removed, don't need call spdk_put_io_channel. */
if (bvdev->bdev) {
spdk_put_io_channel(bvdev->dummy_io_channel);
}
rc = vhost_dev_unregister(&bvdev->vdev); rc = vhost_dev_unregister(&bvdev->vdev);
if (rc != 0) { if (rc != 0) {
return rc; return rc;
} }
/* if the bdev is removed, don't need call spdk_put_io_channel. */
if (bvdev->bdev) {
spdk_put_io_channel(bvdev->dummy_io_channel);
}
if (bvdev->bdev_desc) { if (bvdev->bdev_desc) {
spdk_bdev_close(bvdev->bdev_desc); spdk_bdev_close(bvdev->bdev_desc);
bvdev->bdev_desc = NULL; bvdev->bdev_desc = NULL;