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

Commit 0047634d authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell
Browse files

virtio: console: Fix crash when hot-unplugging a port and read is blocked 



When removing a port we don't check if a program was blocked for read.
This leads to a crash when SIGTERM is sent to the program after
hot-unplugging the port.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent a5b365a6

drivers/char/virtio_console.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -1099,6 +1099,13 @@ static int remove_port(struct port *port) 
{

{

	struct port_buffer *buf;

	struct port_buffer *buf;





	if (port->guest_connected) {

		port->guest_connected = false;

		port->host_connected = false;

		wake_up_interruptible(&port->waitqueue);

		send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0);

	}



	spin_lock_irq(&port->portdev->ports_lock);

	spin_lock_irq(&port->portdev->ports_lock);

	list_del(&port->list);

	list_del(&port->list);

	spin_unlock_irq(&port->portdev->ports_lock);

	spin_unlock_irq(&port->portdev->ports_lock);
@@ -1120,9 +1127,6 @@ static int remove_port(struct port *port) 
		hvc_remove(port->cons.hvc);

		hvc_remove(port->cons.hvc);

#endif

#endif

	}

	}

	if (port->guest_connected)

		send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0);



	sysfs_remove_group(&port->dev->kobj, &port_attribute_group);

	sysfs_remove_group(&port->dev->kobj, &port_attribute_group);

	device_destroy(pdrvdata.class, port->dev->devt);

	device_destroy(pdrvdata.class, port->dev->devt);

	cdev_del(&port->cdev);

	cdev_del(&port->cdev);