diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2018-04-20 21:00:13 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-04-25 20:41:29 +0300 |
| commit | 5c60300d68da32ca77f7f978039dc72bfc78b06b (patch) | |
| tree | f45f092ae920b4a1c8b990855cde54d7fa5ee1fc /drivers/char | |
| parent | aa44ec867030a72e8aa127977e37dec551d8df19 (diff) | |
| download | linux-rpi3-5c60300d68da32ca77f7f978039dc72bfc78b06b.tar.gz linux-rpi3-5c60300d68da32ca77f7f978039dc72bfc78b06b.tar.bz2 linux-rpi3-5c60300d68da32ca77f7f978039dc72bfc78b06b.zip | |
virtio_console: reset on out of memory
When out of memory and we can't add ctrl vq buffers,
probe fails. Unfortunately the error handling is
out of spec: it calls del_vqs without bothering
to reset the device first.
To fix, call the full cleanup function in this case.
Cc: stable@vger.kernel.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/virtio_console.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e8480fe2e1d8..21085515814f 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -2090,6 +2090,7 @@ static int virtcons_probe(struct virtio_device *vdev) spin_lock_init(&portdev->ports_lock); INIT_LIST_HEAD(&portdev->ports); + INIT_LIST_HEAD(&portdev->list); virtio_device_ready(portdev->vdev); @@ -2107,8 +2108,15 @@ static int virtcons_probe(struct virtio_device *vdev) if (!nr_added_bufs) { dev_err(&vdev->dev, "Error allocating buffers for control queue\n"); - err = -ENOMEM; - goto free_vqs; + /* + * The host might want to notify mgmt sw about device + * add failure. + */ + __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, + VIRTIO_CONSOLE_DEVICE_READY, 0); + /* Device was functional: we need full cleanup. */ + virtcons_remove(vdev); + return -ENOMEM; } } else { /* @@ -2139,11 +2147,6 @@ static int virtcons_probe(struct virtio_device *vdev) return 0; -free_vqs: - /* The host might want to notify mgmt sw about device add failure */ - __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, - VIRTIO_CONSOLE_DEVICE_READY, 0); - remove_vqs(portdev); free_chrdev: unregister_chrdev(portdev->chr_major, "virtio-portsdev"); free: |