mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
s390/virtio: handle find on invalid queue gracefully
commit 3438b2c039
upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c7a897a6c1
commit
ffcad0a8f4
1 changed files with 3 additions and 1 deletions
|
@ -283,6 +283,8 @@ static void virtio_ccw_drop_indicators(struct virtio_ccw_device *vcdev)
|
||||||
{
|
{
|
||||||
struct virtio_ccw_vq_info *info;
|
struct virtio_ccw_vq_info *info;
|
||||||
|
|
||||||
|
if (!vcdev->airq_info)
|
||||||
|
return;
|
||||||
list_for_each_entry(info, &vcdev->virtqueues, node)
|
list_for_each_entry(info, &vcdev->virtqueues, node)
|
||||||
drop_airq_indicator(info->vq, vcdev->airq_info);
|
drop_airq_indicator(info->vq, vcdev->airq_info);
|
||||||
}
|
}
|
||||||
|
@ -424,7 +426,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);
|
ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);
|
||||||
if (ret)
|
if (ret)
|
||||||
return 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)
|
static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
|
||||||
|
|
Loading…
Reference in a new issue