lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

virtio: console: Ensure no memleaks in case of unused buffers

Browse Source 
If unused data exists in in_vq, ensure we flush that first and then
detach unused buffers, which will ensure all buffers from the in_vq are
removed.

Also ensure we free the buffers after detaching them.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Amit Shah
2010-02-12 10:32:15 +05:30
committed by Rusty Russell
parent 298add723a
commit a9cdd48557
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/virtio_console.c
View File

@@ -838,6 +838,8 @@ static const struct file_operations port_debugfs_ops = {
/* Remove all port-specific data. */ /* Remove all port-specific data. */
static int remove_port(struct port *port) static int remove_port(struct port *port)
{ {
struct port_buffer *buf;
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);
@@ -851,14 +853,17 @@ static int remove_port(struct port *port)
if (port->guest_connected) if (port->guest_connected)
send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0); send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0);
while (port->in_vq->vq_ops->detach_unused_buf(port->in_vq))
;
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);
/* Remove unused data this port might have received. */
discard_port_data(port); discard_port_data(port);
/* Remove buffers we queued up for the Host to send us data in. */
while ((buf = port->in_vq->vq_ops->detach_unused_buf(port->in_vq)))
free_buf(buf);
kfree(port->name); kfree(port->name);
debugfs_remove(port->debugfs_file); debugfs_remove(port->debugfs_file);