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

bdev/virtio: Abort on bad index in virtio_dev_queue_get_thread

Browse Source 
There is no way to recover from this.

Change-Id: I1667b032bab867d58ad23fa8b1bd59f81620b442
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/408246
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ben Walker 2018-04-18 14:04:11 -07:00 committed by Daniel Verkamp
parent 7540c61a21
commit a00b6819a1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/virtio/virtio.c
View File

@ -613,20 +613,16 @@ virtio_dev_find_and_acquire_queue(struct virtio_dev *vdev, uint16_t start_index)
struct spdk_thread * struct spdk_thread *
virtio_dev_queue_get_thread(struct virtio_dev *vdev, uint16_t index) virtio_dev_queue_get_thread(struct virtio_dev *vdev, uint16_t index)
{ {
struct virtqueue *vq;
struct spdk_thread *thread = NULL; struct spdk_thread *thread = NULL;
if (index >= vdev->max_queues) { if (index >= vdev->max_queues) {
SPDK_ERRLOG("given vq index %"PRIu16" exceeds max queue count %"PRIu16"\n", SPDK_ERRLOG("given vq index %"PRIu16" exceeds max queue count %"PRIu16"\n",
index, vdev->max_queues); index, vdev->max_queues);
return NULL; abort(); /* This is not recoverable */
} }
pthread_mutex_lock(&vdev->mutex); pthread_mutex_lock(&vdev->mutex);
vq = vdev->vqs[index]; thread = vdev->vqs[index]->owner_thread;
if (vq != NULL) {
thread = vq->owner_thread;
}
pthread_mutex_unlock(&vdev->mutex); pthread_mutex_unlock(&vdev->mutex);
return thread; return thread;