Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c60300d authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
parent aa44ec86

drivers/char/virtio_console.c

+10 −7
Original line number Original line Diff line number Diff line
@@ -2090,6 +2090,7 @@ static int virtcons_probe(struct virtio_device *vdev) 




	spin_lock_init(&portdev->ports_lock);

	spin_lock_init(&portdev->ports_lock);

	INIT_LIST_HEAD(&portdev->ports);

	INIT_LIST_HEAD(&portdev->ports);

	INIT_LIST_HEAD(&portdev->list);





	virtio_device_ready(portdev->vdev);

	virtio_device_ready(portdev->vdev);
@@ -2107,8 +2108,15 @@ static int virtcons_probe(struct virtio_device *vdev) 
		if (!nr_added_bufs) {

		if (!nr_added_bufs) {

			dev_err(&vdev->dev,

			dev_err(&vdev->dev,

				"Error allocating buffers for control queue\n");

				"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 {

	} else {

		/*

		/*
@@ -2139,11 +2147,6 @@ static int virtcons_probe(struct virtio_device *vdev) 




	return 0;

	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:

free_chrdev:

	unregister_chrdev(portdev->chr_major, "virtio-portsdev");

	unregister_chrdev(portdev->chr_major, "virtio-portsdev");

free:

free: