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

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Browse Source 
Pull virtio fix from Rusty Russell:
 "Obviously I forgot to push this before linux.conf.au..."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio_console: Don't access uninitialized data.
This commit is contained in:
Linus Torvalds
2013-02-08 12:22:30 +11:00
parent bb5204c2eb aded024a12
commit 124b69b6cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/virtio_console.c
View File

@@ -2062,7 +2062,8 @@ static void virtcons_remove(struct virtio_device *vdev)
/* Disable interrupts for vqs */ /* Disable interrupts for vqs */
vdev->config->reset(vdev); vdev->config->reset(vdev);
/* Finish up work that's lined up */ /* Finish up work that's lined up */
cancel_work_sync(&portdev->control_work); if (use_multiport(portdev))
cancel_work_sync(&portdev->control_work);
list_for_each_entry_safe(port, port2, &portdev->ports, list) list_for_each_entry_safe(port, port2, &portdev->ports, list)
unplug_port(port); unplug_port(port);