diff options
| author |   Halil Pasic <pasic@linux.ibm.com> | 2019-01-21 13:19:43 +0100 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2019-03-06 11:19:44 -0500 |
| commit | 3438b2c039b4bf26881786a1f3450f016d66ad11 (patch) | |
| tree | a78f00f0a7ea4abafb80ca65824a0c08c4f644bf /drivers/s390/virtio | |
| parent | virtio-ccw: diag 500 may return a negative cookie (diff) | |
| download | linux-dev-3438b2c039b4bf26881786a1f3450f016d66ad11.tar.xz linux-dev-3438b2c039b4bf26881786a1f3450f016d66ad11.zip | |
s390/virtio: handle find on invalid queue gracefully
A queue with a capacity of zero is clearly not a valid virtio queue.
Some emulators report zero queue size if queried with an invalid queue
index. Instead of crashing in this case let us just return -ENOENT. To
make that work properly, let us fix the notifier cleanup logic as well.
Cc: stable@vger.kernel.org
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/s390/virtio')
| -rw-r--r-- | drivers/s390/virtio/virtio_ccw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index ae1d56da671d..1a738fe9f26b 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c @@ -272,6 +272,8 @@ static void virtio_ccw_drop_indicators(struct virtio_ccw_device *vcdev) { struct virtio_ccw_vq_info *info; + if (!vcdev->airq_info) + return; list_for_each_entry(info, &vcdev->virtqueues, node) drop_airq_indicator(info->vq, vcdev->airq_info); } @@ -413,7 +415,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF); if (ret) return ret; - return vcdev->config_block->num; + return vcdev->config_block->num ?: -ENOENT; } static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw) |