p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio_console: fix uninitialized variable use 

We try to disable callbacks on c_ivq even without multiport
even though that vq is not initialized in this configuration.

Fixes: c743d09dbd ("virtio: console: Disable callbacks for virtqueues at start of S4 freeze")
Suggested-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2017-03-29 23:22:04 +03:00
parent fe36cbe067
commit 2055997f98
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/virtio_console.c
View File

@ -2202,6 +2202,7 @@ static int virtcons_freeze(struct virtio_device *vdev)
vdev->config->reset(vdev);
if (use_multiport(portdev))
virtqueue_disable_cb(portdev->c_ivq);
cancel_work_sync(&portdev->control_work);
cancel_work_sync(&portdev->config_work);
@ -2209,6 +2210,7 @@ static int virtcons_freeze(struct virtio_device *vdev)
* Once more: if control_work_handler() was running, it would
* enable the cb as the last step.
*/
if (use_multiport(portdev))
virtqueue_disable_cb(portdev->c_ivq);
remove_controlq_data(portdev);